summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-06-09 13:46:36 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-06-09 13:46:36 +0200
commitebd8e7d74b798ee0c7dc2232d72c13b0d51e1fe4 (patch)
tree9c1a5a54d6ffa06719a071dd9d43f5a0c40b887d /scripts/src
parent8d4dbe3747b468558998968ebe0b1bf1c78169ca (diff)
Added initial ninja support to use add MAKETYPE=ninja to compile command line (nw)
Custom build tasks are not yet working
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua16
-rw-r--r--scripts/src/osd/modules.lua2
-rw-r--r--scripts/src/tests.lua4
3 files changed, 11 insertions, 11 deletions
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",
}