diff options
| author | 2015-05-28 17:07:47 -0500 | |
|---|---|---|
| committer | 2015-05-28 17:07:47 -0500 | |
| commit | ea2762e799e00a09155cd0d1d4a81162a8a1ab03 (patch) | |
| tree | 5ecb3cfb04e49341e161c0a5db67ce5446b9febf /scripts | |
| parent | 4332164659ec242c69d3d314a523917955fb9d1c (diff) | |
| parent | 8f4d8bf37ee85ff47e4628f9a365abd6d83f9436 (diff) | |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/genie.lua | 15 | ||||
| -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 | ||||
| -rw-r--r-- | scripts/toolchain.lua | 25 |
6 files changed, 62 insertions, 21 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 7a0f2128fe5..b6ccf16583b 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1112,6 +1112,21 @@ configuration { "x64", "vs*" } MAME_DIR .. "3rdparty/dxsdk/lib/x64", } +configuration { "winphone8* or winstore8*" } + removelinks { + "DelayImp", + "gdi32", + "psapi" + } + links { + "d3d11", + "dxgi" + } + linkoptions { + "/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata + } + + configuration { } 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 { diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 86998b83813..91d1f29884e 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -46,6 +46,8 @@ newoption { { "vs2013-xp", "Visual Studio 2013 targeting XP" }, { "winphone8", "Windows Phone 8.0" }, { "winphone81", "Windows Phone 8.1" }, + { "winstore81", "Windows Store 8.1" }, + { "winstore82", "Universal Windows App" } }, } @@ -317,6 +319,20 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone81") end + if "winstore81" == _OPTIONS["vs"] then + premake.vstudio.toolset = "v120" + premake.vstudio.storeapp = "8.1" + platforms { "ARM" } + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore81") + end + + if "winstore82" == _OPTIONS["vs"] then + premake.vstudio.toolset = "v140" + premake.vstudio.storeapp = "8.2" + platforms { "ARM" } + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82") + end + if "intel-14" == _OPTIONS["vs"] then premake.vstudio.toolset = "Intel C++ Compiler XE 14.0" location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") @@ -407,12 +423,19 @@ function toolchain(_buildDir, _subDir) configuration { "x64", "vs*-clang", "Debug" } targetdir (_buildDir .. _ACTION .. "-clang/bin/x64/Debug") - + configuration { "vs*-clang" } buildoptions { "-Qunused-arguments", } + configuration { "winphone8* or winstore8*" } + removeflags { + "StaticRuntime", + "NoExceptions", + "EnableMinimalRebuild", + } + configuration { "mingw*" } defines { "WIN32" } |
