From 58a4e4528928cc9dff0bf89babc2c27ec722db42 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 28 May 2015 08:43:47 +0200 Subject: Fixed compile for portaudio on 32bit and windows clang (nw) --- scripts/src/3rdparty.lua | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'scripts/src/3rdparty.lua') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index aad89112883..a2485a1ff7f 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -624,6 +624,8 @@ project "portaudio" "-Wno-unused-variable", "-Wno-unused-value", "-Wno-unused-function", + "-Wno-unknown-pragmas", + "-Wno-sometimes-uninitialized", } configuration { "vs*" } @@ -657,21 +659,16 @@ project "portaudio" "PA_USE_DS=1", "PA_USE_WDMKS=1", "PA_USE_WMME=1", - "PA_USE_WASAPI=1", } includedirs { MAME_DIR .. "3rdparty/portaudio/src/os/win", } - configuration { "mingw*" } - includedirs { - MAME_DIR .. "3rdparty/portaudio/src/hostapi/wasapi/mingw-include", - } + 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_x86_plain_converters.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", @@ -679,7 +676,6 @@ project "portaudio" 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", - MAME_DIR .. "3rdparty/portaudio/src/hostapi/wasapi/pa_win_wasapi.c", } end -- cgit v1.2.3 From bef4e6d73a546a95e14bd09876ef315a8f71fe44 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 28 May 2015 08:48:03 +0200 Subject: fix for unknown warning options for clang 3.5 (nw) --- scripts/src/3rdparty.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'scripts/src/3rdparty.lua') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index a2485a1ff7f..4e7330af691 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -619,7 +619,6 @@ project "portaudio" "-Wno-bad-function-cast", "-Wno-undef", "-Wno-missing-braces", - "-Wno-unused-but-set-variable", "-Wno-maybe-uninitialized", "-Wno-unused-variable", "-Wno-unused-value", @@ -628,6 +627,15 @@ project "portaudio" "-Wno-sometimes-uninitialized", } + local version = str_to_version(_OPTIONS["gcc_version"]) + if string.find(_OPTIONS["gcc"], "clang") then + if (version >= 30500) then + buildoptions { + "-Wno-unknown-warning-option", + } + end + end + configuration { "vs*" } buildoptions { "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer -- cgit v1.2.3 From 3b3f872d6847981f67d0e8055e72649b2a560d2c Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 28 May 2015 09:00:38 +0200 Subject: ups (nw) --- scripts/src/3rdparty.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/src/3rdparty.lua') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 4e7330af691..baea18c8398 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -619,6 +619,7 @@ project "portaudio" "-Wno-bad-function-cast", "-Wno-undef", "-Wno-missing-braces", + "-Wno-unused-but-set-variable", "-Wno-maybe-uninitialized", "-Wno-unused-variable", "-Wno-unused-value", -- cgit v1.2.3 From 4a07723b609cef6c22107294737db533b8f3fa3f Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 28 May 2015 09:07:30 +0200 Subject: set for all clangs (nw) --- scripts/src/3rdparty.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'scripts/src/3rdparty.lua') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index baea18c8398..6d39a90ce8d 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -630,11 +630,9 @@ project "portaudio" local version = str_to_version(_OPTIONS["gcc_version"]) if string.find(_OPTIONS["gcc"], "clang") then - if (version >= 30500) then - buildoptions { - "-Wno-unknown-warning-option", - } - end + buildoptions_c { + "-Wno-unknown-warning-option", + } end configuration { "vs*" } -- cgit v1.2.3 From de8da0cc52dfc3986c14df985ccdb58bc280a2aa Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 28 May 2015 09:56:31 +0200 Subject: fix for one more warning (nw) --- scripts/src/3rdparty.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/src/3rdparty.lua') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 6d39a90ce8d..3daff931827 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -632,6 +632,7 @@ project "portaudio" if string.find(_OPTIONS["gcc"], "clang") then buildoptions_c { "-Wno-unknown-warning-option", + "-Wno-absolute-value", } end -- cgit v1.2.3 From de21d38efbcaa909cdc18690645a15e9c83de3a5 Mon Sep 17 00:00:00 2001 From: Peter Ferrie Date: Thu, 28 May 2015 09:38:32 -0700 Subject: 3rdparty.lua: add check for nil first (nw) --- scripts/src/3rdparty.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/src/3rdparty.lua') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 3daff931827..a140bef7860 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -629,7 +629,7 @@ project "portaudio" } local version = str_to_version(_OPTIONS["gcc_version"]) - if string.find(_OPTIONS["gcc"], "clang") then + if (_OPTIONS["gcc"]~=nil) and string.find(_OPTIONS["gcc"], "clang") then buildoptions_c { "-Wno-unknown-warning-option", "-Wno-absolute-value", -- cgit v1.2.3