diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 18 | ||||
-rw-r--r-- | scripts/src/lib.lua | 2 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 21 | ||||
-rw-r--r-- | scripts/src/tools.lua | 2 |
4 files changed, 23 insertions, 20 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 diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 54540f0f630..ef809dd5b46 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -391,8 +391,6 @@ project "formats" MAME_DIR .. "src/lib/formats/x1_tap.h", MAME_DIR .. "src/lib/formats/xdf_dsk.c", MAME_DIR .. "src/lib/formats/xdf_dsk.h", - MAME_DIR .. "src/lib/formats/z80ne_dsk.c", - MAME_DIR .. "src/lib/formats/z80ne_dsk.h", MAME_DIR .. "src/lib/formats/zx81_p.c", MAME_DIR .. "src/lib/formats/zx81_p.h", MAME_DIR .. "src/lib/formats/hxcmfm_dsk.c", diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index d1f9c97a74b..9d61b0d4892 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -15,16 +15,17 @@ files { MAME_DIR .. "src/emu/netlist/nl_setup.h", MAME_DIR .. "src/emu/netlist/nl_factory.c", MAME_DIR .. "src/emu/netlist/nl_factory.h", - MAME_DIR .. "src/emu/netlist/pconfig.h", - MAME_DIR .. "src/emu/netlist/palloc.c", - MAME_DIR .. "src/emu/netlist/palloc.h", - MAME_DIR .. "src/emu/netlist/plists.h", - MAME_DIR .. "src/emu/netlist/pparser.c", - MAME_DIR .. "src/emu/netlist/pparser.h", - MAME_DIR .. "src/emu/netlist/pstate.c", - MAME_DIR .. "src/emu/netlist/pstate.h", - MAME_DIR .. "src/emu/netlist/pstring.c", - MAME_DIR .. "src/emu/netlist/pstring.h", + MAME_DIR .. "src/emu/netlist/plib/pconfig.h", + MAME_DIR .. "src/emu/netlist/plib/palloc.c", + MAME_DIR .. "src/emu/netlist/plib/palloc.h", + MAME_DIR .. "src/emu/netlist/plib/plists.h", + MAME_DIR .. "src/emu/netlist/plib/poptions.h", + MAME_DIR .. "src/emu/netlist/plib/pparser.c", + MAME_DIR .. "src/emu/netlist/plib/pparser.h", + MAME_DIR .. "src/emu/netlist/plib/pstate.c", + MAME_DIR .. "src/emu/netlist/plib/pstate.h", + MAME_DIR .. "src/emu/netlist/plib/pstring.c", + MAME_DIR .. "src/emu/netlist/plib/pstring.h", MAME_DIR .. "src/emu/netlist/analog/nld_bjt.c", MAME_DIR .. "src/emu/netlist/analog/nld_bjt.h", MAME_DIR .. "src/emu/netlist/analog/nld_fourterm.c", diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 0c1cbc3075e..936afb54346 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -448,7 +448,7 @@ links { includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/emu", + MAME_DIR .. "src/emu/netlist", } files { |