diff options
| author | 2015-05-28 17:07:47 -0500 | |
|---|---|---|
| committer | 2015-05-28 17:07:47 -0500 | |
| commit | ea2762e799e00a09155cd0d1d4a81162a8a1ab03 (patch) | |
| tree | 5ecb3cfb04e49341e161c0a5db67ce5446b9febf /scripts/src/3rdparty.lua | |
| parent | 4332164659ec242c69d3d314a523917955fb9d1c (diff) | |
| parent | 8f4d8bf37ee85ff47e4628f9a365abd6d83f9436 (diff) | |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'scripts/src/3rdparty.lua')
| -rw-r--r-- | scripts/src/3rdparty.lua | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index e744db9b79b..ebca9fed0ef 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -623,8 +623,18 @@ project "portaudio" "-Wno-maybe-uninitialized", "-Wno-unused-value", "-Wno-unused-function", + "-Wno-unknown-pragmas", + "-Wno-sometimes-uninitialized", } + local version = str_to_version(_OPTIONS["gcc_version"]) + if (_OPTIONS["gcc"]~=nil) and string.find(_OPTIONS["gcc"], "clang") then + buildoptions_c { + "-Wno-unknown-warning-option", + "-Wno-absolute-value", + } + end + configuration { "vs*" } buildoptions { "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer @@ -656,21 +666,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", @@ -678,7 +683,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 |
