diff options
author | 2015-05-30 14:57:13 +0200 | |
---|---|---|
committer | 2015-05-30 14:57:13 +0200 | |
commit | d1d9dfc2d4be85cee8c8c990950d72ee6df78e5e (patch) | |
tree | 495d4e5a066ee13be131f08437732b3588d43a42 /scripts/genie.lua | |
parent | fe71f92dd24270ae7c5621166b096c665ca0e4f5 (diff) | |
parent | 51709eef04f9f0c6d621447c568e170927fa9472 (diff) |
Merge pull request #4 from mamedev/master
Sync to base master
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r-- | scripts/genie.lua | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 79702a38c78..356d4d8d3dc 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -60,6 +60,11 @@ newoption { } newoption { + trigger = "with-tests", + description = "Enable building tests.", +} + +newoption { trigger = "osd", description = "Choose OSD layer implementation", } @@ -720,12 +725,21 @@ if _OPTIONS["OPTIMIZE"] then } end if _OPTIONS["LTO"]=="1" then +-- -flto=4 -> 4 threads + buildoptions { + "-flto=4", + } buildoptions { - "-flto", + "-fno-fat-lto-objects", } linkoptions { - "-flto", + "-flto=4", } + linkoptions { + "-fno-fat-lto-objects", + } + + end end @@ -863,6 +877,12 @@ end "-Wno-array-bounds" } end + if (version >= 50000) then + buildoptions { + "-D__USE_MINGW_ANSI_STDIO=1", + } + end + end end --ifeq ($(findstring arm,$(UNAME)),arm) @@ -1093,6 +1113,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 { } @@ -1138,3 +1173,7 @@ if _OPTIONS["with-tools"] then dofile(path.join("src", "tools.lua")) end +if _OPTIONS["with-tests"] then + group "tests" + dofile(path.join("src", "tests.lua")) +end |