diff options
author | 2016-11-30 11:08:19 +1100 | |
---|---|---|
committer | 2016-11-30 11:08:19 +1100 | |
commit | 3b4cac12debe8e6d998edb6899908ac6b84a637b (patch) | |
tree | 1ad5a12a0f0b75dcfb0776e05f6e3f1c9919d212 /docs/release/scripts/genie.lua | |
parent | 05d642eaca8e1a7ce978e14d11a836513fbf98c8 (diff) |
0.180 Release fileshbmame180
Diffstat (limited to 'docs/release/scripts/genie.lua')
-rw-r--r-- | docs/release/scripts/genie.lua | 61 |
1 files changed, 28 insertions, 33 deletions
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index 8656c771f27..7a4668e7d14 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -2,6 +2,10 @@ -- copyright-holders:MAMEdev Team STANDALONE = false +-- Big project specific +premake.make.makefile_ignore = true +premake._checkgenerate = false + newoption { trigger = 'build-dir', description = 'Build directory name', @@ -368,15 +372,6 @@ newoption { } newoption { - trigger = "USE_LIBUV", - description = "Use libuv.", - allowed = { - { "0", "Disabled" }, - { "1", "Enabled" }, - } -} - -newoption { trigger = "DEBUG_DIR", description = "Default directory for debugger.", } @@ -386,6 +381,11 @@ newoption { description = "Arguments for running debug build.", } +newoption { + trigger = "WEBASSEMBLY", + description = "Produce WebAssembly output when building with Emscripten.", +} + dofile ("extlib.lua") if _OPTIONS["SHLIB"]=="1" then @@ -412,10 +412,6 @@ if not _OPTIONS["NOASM"] then end end -if not _OPTIONS["USE_LIBUV"] then - _OPTIONS["USE_LIBUV"] = "1" -end - if _OPTIONS["NOASM"]=="1" and not _OPTIONS["FORCE_DRC_C_BACKEND"] then _OPTIONS["FORCE_DRC_C_BACKEND"] = "1" end @@ -479,6 +475,7 @@ configuration { "vs*" } configuration { "Debug", "vs*" } flags { "Symbols", + "NoIncrementalLink", } configuration { "Release", "vs*" } @@ -486,7 +483,7 @@ configuration { "Release", "vs*" } "Optimize", } --- Force VS2015 targets to use bundled SDL2 +-- Force VS2015/17 targets to use bundled SDL2 if string.sub(_ACTION,1,4) == "vs20" and _OPTIONS["osd"]=="sdl" then if _OPTIONS["with-bundled-sdl2"]==nil then _OPTIONS["with-bundled-sdl2"] = "1" @@ -499,6 +496,12 @@ end configuration {} +if _OPTIONS["osd"] == "uwp" then + windowstargetplatformversion("10.0.14393.0") + windowstargetplatformminversion("10.0.14393.0") + premake._filelevelconfig = true +end + msgcompile ("Compiling $(subst ../,,$<)...") msgcompile_objc ("Objective-C compiling $(subst ../,,$<)...") @@ -527,12 +530,6 @@ configuration { "gmake or ninja" } dofile ("toolchain.lua") -if _OPTIONS["USE_LIBUV"]=="0" then - defines { - "NO_LIBUV", - } -end - if _OPTIONS["targetos"]=="windows" then configuration { "x64" } defines { @@ -695,7 +692,7 @@ if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["ta "-std=c++1y", } - buildoptions_objc { + buildoptions_objcpp { "-x objective-c++", "-std=c++1y", } @@ -705,7 +702,7 @@ else "-std=c++14", } - buildoptions_objc { + buildoptions_objcpp { "-x objective-c++", "-std=c++14", } @@ -930,7 +927,7 @@ if _OPTIONS["targetos"]~="freebsd" then end -- warnings only applicable to OBJ-C compiles - buildoptions_objc { + buildoptions_objcpp { "-Wpointer-arith", } @@ -1138,10 +1135,14 @@ configuration { "mingw*" } "shell32", "userenv", } + configuration { "mingw-clang" } + local version = str_to_version(_OPTIONS["gcc_version"]) + if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") and ((version < 30900)) then linkoptions { "-pthread", } + end configuration { "vs*" } @@ -1153,6 +1154,8 @@ configuration { "vs*" } "_CRT_SECURE_NO_DEPRECATE", "_CRT_STDIO_LEGACY_WIDE_SPECIFIERS", } +-- Windows Store/Phone projects already link against the available libraries. +if _OPTIONS["vs"]==nil or not (string.startswith(_OPTIONS["vs"], "winstore8") or string.startswith(_OPTIONS["vs"], "winphone8")) then links { "user32", "winmm", @@ -1165,6 +1168,7 @@ configuration { "vs*" } "shell32", "userenv", } +end buildoptions { "/WX", -- Treats all compiler warnings as errors. @@ -1272,7 +1276,7 @@ end includedirs { MAME_DIR .. "3rdparty/dxsdk/Include" } -configuration { "vs2015*" } +configuration { "vs201*" } buildoptions { "/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration @@ -1287,15 +1291,6 @@ configuration { "vs2015*" } "/wd4592", -- warning C4592: symbol will be dynamically initialized (implementation limitation) } 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 } |