diff options
author | 2016-08-31 18:41:35 +1000 | |
---|---|---|
committer | 2016-08-31 18:41:35 +1000 | |
commit | 58ad88f3527ac1523c12593ee6f42d869dbcda6a (patch) | |
tree | 9e5ddb502a3f2d1ecf2dcaf5ef3d5f41da087cf6 /docs/release/scripts/src/3rdparty.lua | |
parent | b1bef5cbde2d3d633b3b041e77647a4430d3ecc6 (diff) |
0.177 Release fileshbmame177
Diffstat (limited to 'docs/release/scripts/src/3rdparty.lua')
-rw-r--r-- | docs/release/scripts/src/3rdparty.lua | 284 |
1 files changed, 144 insertions, 140 deletions
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index e3c29933220..23b9264bba3 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -355,14 +355,14 @@ project "7z" configuration { "gmake or ninja" } buildoptions_c { "-Wno-undef", - "-Wno-strict-prototypes", + "-Wno-strict-prototypes", } configuration { "mingw*" } buildoptions_c { "-Wno-strict-prototypes", } - + configuration { "vs*" } buildoptions { "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter @@ -431,6 +431,7 @@ end -------------------------------------------------- -- LUA library objects -------------------------------------------------- +if (STANDALONE~=true) then if not _OPTIONS["with-system-lua"] then project "lua" @@ -565,6 +566,7 @@ project "lualibs" MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", } +end -------------------------------------------------- -- portmidi library objects -------------------------------------------------- @@ -735,8 +737,16 @@ end configuration { } + local version = str_to_version(_OPTIONS["gcc_version"]) + if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "gcc") then + if version >= 60000 then + buildoptions_cpp { + "-Wno-misleading-indentation", + } + end + end + if _OPTIONS["targetos"]=="windows" then - local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then buildoptions { "-Wno-unknown-attributes", @@ -747,7 +757,6 @@ end end if _OPTIONS["targetos"]=="macosx" then - local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then buildoptions { "-Wno-switch", @@ -818,150 +827,150 @@ end -- --if not _OPTIONS["with-system-portaudio"] then --project "portaudio" --- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4" --- kind "StaticLib" +-- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4" +-- kind "StaticLib" -- --- configuration { "vs*" } --- buildoptions { --- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch --- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data --- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter --- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch --- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced --- "/wd4127", -- warning C4127: conditional expression is constant --- } +-- configuration { "vs*" } +-- buildoptions { +-- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch +-- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data +-- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter +-- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch +-- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced +-- "/wd4127", -- warning C4127: conditional expression is constant +-- } --if _OPTIONS["vs"]=="intel-15" then --- buildoptions { --- "/Qwd869", -- remark #869: parameter "xxx" was never referenced --- "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated --- "/Qwd2544", -- message #2544: empty dependent statement in if-statement --- "/Qwd1879", -- warning #1879: unimplemented pragma ignored --- } +-- buildoptions { +-- "/Qwd869", -- remark #869: parameter "xxx" was never referenced +-- "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated +-- "/Qwd2544", -- message #2544: empty dependent statement in if-statement +-- "/Qwd1879", -- warning #1879: unimplemented pragma ignored +-- } --end --- configuration { "vs2015*" } --- buildoptions { --- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration --- } +-- configuration { "vs2015*" } +-- buildoptions { +-- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration +-- } -- --- configuration { "gmake or ninja" } --- buildoptions_c { --- "-Wno-strict-prototypes", --- "-Wno-bad-function-cast", --- "-Wno-undef", --- "-Wno-missing-braces", --- "-Wno-unused-variable", --- "-Wno-unused-value", --- "-Wno-unused-function", --- "-Wno-unknown-pragmas", --- } +-- configuration { "gmake or ninja" } +-- buildoptions_c { +-- "-Wno-strict-prototypes", +-- "-Wno-bad-function-cast", +-- "-Wno-undef", +-- "-Wno-missing-braces", +-- "-Wno-unused-variable", +-- "-Wno-unused-value", +-- "-Wno-unused-function", +-- "-Wno-unknown-pragmas", +-- } -- --- local version = str_to_version(_OPTIONS["gcc_version"]) --- if (_OPTIONS["gcc"]~=nil) then --- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then --- buildoptions_c { --- "-Wno-unknown-warning-option", --- "-Wno-absolute-value", --- "-Wno-unused-but-set-variable", --- "-Wno-maybe-uninitialized", --- "-Wno-sometimes-uninitialized", --- } --- else --- if (version >= 40600) then --- buildoptions_c { --- "-Wno-unused-but-set-variable", --- "-Wno-maybe-uninitialized", --- "-Wno-sometimes-uninitialized", --- } --- end --- end --- end --- configuration { "vs*" } --- buildoptions { --- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer --- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used --- } +-- local version = str_to_version(_OPTIONS["gcc_version"]) +-- if (_OPTIONS["gcc"]~=nil) then +-- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then +-- buildoptions_c { +-- "-Wno-unknown-warning-option", +-- "-Wno-absolute-value", +-- "-Wno-unused-but-set-variable", +-- "-Wno-maybe-uninitialized", +-- "-Wno-sometimes-uninitialized", +-- } +-- else +-- if (version >= 40600) then +-- buildoptions_c { +-- "-Wno-unused-but-set-variable", +-- "-Wno-maybe-uninitialized", +-- "-Wno-sometimes-uninitialized", +-- } +-- end +-- end +-- end +-- configuration { "vs*" } +-- buildoptions { +-- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer +-- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used +-- } -- --- configuration { } +-- configuration { } -- --- includedirs { --- MAME_DIR .. "3rdparty/portaudio/include", --- MAME_DIR .. "3rdparty/portaudio/src/common", --- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/include", +-- MAME_DIR .. "3rdparty/portaudio/src/common", +-- } -- --- files { --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c", --- } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c", +-- } -- --- if _OPTIONS["targetos"]=="windows" then --- defines { --- "PA_USE_DS=1", --- "PA_USE_WDMKS=1", --- "PA_USE_WMME=1", --- } --- includedirs { --- MAME_DIR .. "3rdparty/portaudio/src/os/win", --- } +-- if _OPTIONS["targetos"]=="windows" then +-- defines { +-- "PA_USE_DS=1", +-- "PA_USE_WDMKS=1", +-- "PA_USE_WMME=1", +-- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/src/os/win", +-- } -- --- configuration { } --- files { --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c", --- } +-- configuration { } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c", +-- } -- --- end --- if _OPTIONS["targetos"]=="linux" then --- defines { --- "PA_USE_ALSA=1", --- "PA_USE_OSS=1", --- "HAVE_LINUX_SOUNDCARD_H", --- } --- includedirs { --- MAME_DIR .. "3rdparty/portaudio/src/os/unix", --- } --- files { --- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c", --- } --- end --- if _OPTIONS["targetos"]=="macosx" then --- defines { --- "PA_USE_COREAUDIO=1", --- } --- includedirs { --- MAME_DIR .. "3rdparty/portaudio/src/os/unix", --- } --- files { --- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", --- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c", --- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c", --- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", --- } --- end +-- end +-- if _OPTIONS["targetos"]=="linux" then +-- defines { +-- "PA_USE_ALSA=1", +-- "PA_USE_OSS=1", +-- "HAVE_LINUX_SOUNDCARD_H", +-- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix", +-- } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c", +-- } +-- end +-- if _OPTIONS["targetos"]=="macosx" then +-- defines { +-- "PA_USE_COREAUDIO=1", +-- } +-- includedirs { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix", +-- } +-- files { +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c", +-- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c", +-- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c", +-- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c", +-- } +-- end -- --else --links { --- ext_lib("portaudio"), +-- ext_lib("portaudio"), --} --end @@ -1034,11 +1043,6 @@ project "uv" "WIN32_LEAN_AND_MEAN", "_WIN32_WINNT=0x0502", } - if _ACTION == "vs2013" then - files { - MAME_DIR .. "3rdparty/libuv/src/win/snprintf.c", - } - end configuration { } files { MAME_DIR .. "3rdparty/libuv/src/win/async.c", @@ -1161,7 +1165,7 @@ project "uv" links { "kvm", } - end + end if (_OPTIONS["SHADOW_CHECK"]=="1") then removebuildoptions { |