summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts/genie.lua
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2016-06-29 20:24:44 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2016-06-29 20:24:44 +1000
commitd464963202d6fac34b687f232a42a1d3353630c2 (patch)
treee4281c2e2b2832b005ca866db5f901f28e507139 /docs/release/scripts/genie.lua
parentafef8430619718d39dd7906a9342fe3bd06b6225 (diff)
0.175 Release fileshbmame175
Diffstat (limited to 'docs/release/scripts/genie.lua')
-rw-r--r--docs/release/scripts/genie.lua18
1 files changed, 5 insertions, 13 deletions
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua
index cfb30ed95d8..903d77ce3ed 100644
--- a/docs/release/scripts/genie.lua
+++ b/docs/release/scripts/genie.lua
@@ -350,15 +350,6 @@ newoption {
}
newoption {
- trigger = "IGNORE_GIT",
- description = "Ignore usage of git command in build process",
- allowed = {
- { "0", "Do not ignore" },
- { "1", "Ingore" },
- },
-}
-
-newoption {
trigger = "SOURCES",
description = "List of sources to compile.",
}
@@ -521,7 +512,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 +672,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
@@ -714,7 +705,7 @@ end
-- this speeds it up a bit by piping between the preprocessor/compiler/assembler
if not ("pnacl" == _OPTIONS["gcc"]) then
buildoptions {
- "--pipe",
+ "-pipe",
}
end
-- add -g if we need symbols, and ensure we have frame pointers
@@ -1119,6 +1110,7 @@ configuration { "mingw*" }
"-static-libgcc",
"-static-libstdc++",
"-static",
+ "-Wl,--start-group",
}
links {
"user32",
@@ -1265,7 +1257,7 @@ end
includedirs {
MAME_DIR .. "3rdparty/dxsdk/Include"
}
-configuration { "vs2015" }
+configuration { "vs2015*" }
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