diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/genie.lua | 4 | ||||
-rw-r--r-- | scripts/src/3rdparty.lua | 16 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 2 | ||||
-rw-r--r-- | scripts/src/tests.lua | 4 | ||||
-rw-r--r-- | scripts/toolchain.lua | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 95bb6dba6af..d17753a8834 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -521,7 +521,7 @@ if (_OPTIONS["SOURCES"] == nil) then dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua")) end -configuration { "gmake" } +configuration { "gmake or ninja" } flags { "SingleOutputDir", } @@ -681,7 +681,7 @@ end "LUA_COMPAT_5_2", } - if _ACTION == "gmake" then + if _ACTION == "gmake" or _ACTION == "ninja" then --we compile C-only to C99 standard with GNU extensions diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 484e13c1de0..57bdb998713 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -88,7 +88,7 @@ project "zlib" local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then - configuration { "gmake" } + configuration { "gmake or ninja" } if (version >= 30700) then buildoptions { "-Wno-shift-negative-value", @@ -113,7 +113,7 @@ end "verbose=-1", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-strict-prototypes", } @@ -299,7 +299,7 @@ end "HAVE_CONFIG_H=1", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-unused-function", "-O0", @@ -352,7 +352,7 @@ project "7z" uuid "ad573d62-e76a-4b11-ae34-5110a6789a42" kind "StaticLib" - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-undef", "-Wno-strict-prototypes", @@ -446,7 +446,7 @@ project "lua" -- "ForceCPP", --} - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-bad-function-cast" } @@ -717,7 +717,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/freebsd", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-uninitialized", "-Wno-unused-function", @@ -845,7 +845,7 @@ end -- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration -- } -- --- configuration { "gmake" } +-- configuration { "gmake or ninja" } -- buildoptions_c { -- "-Wno-strict-prototypes", -- "-Wno-bad-function-cast", @@ -982,7 +982,7 @@ project "uv" MAME_DIR .. "3rdparty/libuv/src/win", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-strict-prototypes", "-Wno-bad-function-cast", diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 5fb1d23c1bc..b8e5bb61b83 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -244,7 +244,7 @@ function qtdebuggerbuild() } local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then - configuration { "gmake" } + configuration { "gmake or ninja" } if (version >= 30600) then buildoptions { "-Wno-inconsistent-missing-override", diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index b5bb5b37366..e0a8da88d75 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -16,7 +16,7 @@ project "gtest" uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4" kind "StaticLib" - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-undef", "-Wno-unused-variable", @@ -52,7 +52,7 @@ project("mametests") targetdir(MAME_DIR) end - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-undef", } diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 8536845c266..6046b4d97d8 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -109,7 +109,7 @@ function toolchain(_buildDir, _subDir) windowsPlatform = _OPTIONS["with-windows"] end - if _ACTION == "gmake" then + if _ACTION == "gmake" or _ACTION == "ninja" then if nil == _OPTIONS["gcc"] or nil == _OPTIONS["gcc_version"] then print("GCC flavor and version must be specified!") |