summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts/genie.lua
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-10-29 10:49:22 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2019-10-29 10:49:22 +1100
commite4ee887d5cdffb6767e1078fe9dca32d7c920f2e (patch)
tree1c3ecc61329eae8cbad23cf1d2ca03a01764f739 /docs/release/scripts/genie.lua
parent1e8a03afab272a010763935b564c742155513797 (diff)
0.215 Release filestag215
Diffstat (limited to 'docs/release/scripts/genie.lua')
-rw-r--r--docs/release/scripts/genie.lua48
1 files changed, 32 insertions, 16 deletions
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua
index 707fc4d1d79..b29e02f9d90 100644
--- a/docs/release/scripts/genie.lua
+++ b/docs/release/scripts/genie.lua
@@ -42,6 +42,9 @@ function str_to_version(str)
end
local cnt = 10000
for word in string.gmatch(str, '([^.]+)') do
+ if(tonumber(word) == nil) then
+ return val
+ end
val = val + tonumber(word) * cnt
cnt = cnt / 100
end
@@ -769,22 +772,18 @@ end
local version = str_to_version(_OPTIONS["gcc_version"])
if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["targetos"]=="macosx" and (version <= 60000))) then
buildoptions_cpp {
- "-x c++",
"-std=c++1y",
}
buildoptions_objcpp {
- "-x objective-c++",
"-std=c++1y",
}
else
buildoptions_cpp {
- "-x c++",
"-std=c++14",
}
buildoptions_objcpp {
- "-x objective-c++",
"-std=c++14",
}
end
@@ -914,6 +913,7 @@ end
configuration { "mingw-clang" }
buildoptions {
"-Xclang -flto-visibility-public-std", -- workround for __imp___ link errors
+ "-Wno-nonportable-include-path", -- workround for clang 9.0.0 case sensitivity bug when including GL/glext.h
}
configuration { }
@@ -1178,7 +1178,6 @@ configuration { "asmjs" }
"-s USE_SDL_TTF=2",
}
buildoptions_cpp {
- "-x c++",
"-std=c++14",
}
linkoptions {
@@ -1194,7 +1193,6 @@ configuration { "android*" }
"-Wno-incompatible-ms-struct",
}
buildoptions_cpp {
- "-x c++",
"-std=c++14",
"-Wno-extern-c-compat",
"-Wno-tautological-constant-out-of-range-compare",
@@ -1213,7 +1211,6 @@ configuration { "pnacl" }
"-Wno-inline-new-delete",
}
buildoptions_cpp {
- "-x c++",
"-std=c++14",
}
archivesplit_size "20"
@@ -1443,6 +1440,29 @@ if _OPTIONS["vs"]=="intel-15" then
}
end
+if _OPTIONS["vs"]=="clangcl" then
+ buildoptions {
+ "-Wno-enum-conversion",
+ "-Wno-ignored-qualifiers",
+ "-Wno-missing-braces",
+ "-Wno-missing-field-initializers",
+ "-Wno-new-returns-null",
+ "-Wno-nonportable-include-path",
+ "-Wno-pointer-bool-conversion",
+ "-Wno-pragma-pack",
+ "-Wno-switch",
+ "-Wno-tautological-constant-out-of-range-compare",
+ "-Wno-tautological-pointer-compare",
+ "-Wno-unknown-warning-option",
+ "-Wno-unused-const-variable",
+ "-Wno-unused-function",
+ "-Wno-unused-label",
+ "-Wno-unused-local-typedef",
+ "-Wno-unused-private-field",
+ "-Wno-unused-variable",
+ }
+end
+
linkoptions {
"/ignore:4221", -- LNK4221: This object file does not define any previously undefined public symbols, so it will not be used by any link operation that consumes this library
}
@@ -1497,25 +1517,21 @@ configuration { "vsllvm" }
}
--- adding this till we sort out asserts in debug mode
-configuration { "Debug", "gmake" }
- buildoptions_cpp {
- "-Wno-terminate",
- }
-
configuration { }
if (_OPTIONS["SOURCES"] ~= nil) then
local str = _OPTIONS["SOURCES"]
+ local sourceargs = ""
for word in string.gmatch(str, '([^,]+)') do
- if (not os.isfile(path.join(MAME_DIR ,word))) then
+ if (not os.isfile(path.join(MAME_DIR, word))) then
print("File " .. word.. " does not exist")
os.exit()
end
+ sourceargs = sourceargs .. " " .. word
end
- OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " target " .. _OPTIONS["subtarget"])
+ OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py sourcesproject -r " .. MAME_DIR .. " -t " .. _OPTIONS["subtarget"] .. sourceargs )
load(OUT_STR)()
- os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"]..".flt")
+ os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py sourcesfilter" .. sourceargs .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"] .. ".flt" )
end
group "libs"