diff options
author | 2022-06-29 14:19:01 +1000 | |
---|---|---|
committer | 2022-06-29 14:19:01 +1000 | |
commit | 0278f7bab9196b6b32fb458487298f22f2e542ea (patch) | |
tree | 90a72e5ba9bff91d163f953a2a668b01e6ca5df7 /docs/release/scripts/genie.lua | |
parent | f3b9e80a00fb0750b502e629e2c98edde65e657a (diff) |
Files for 0.245tag245
Diffstat (limited to 'docs/release/scripts/genie.lua')
-rw-r--r-- | docs/release/scripts/genie.lua | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index 216e150a4f7..37b8ee967e2 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -557,7 +557,7 @@ if (_OPTIONS["PROJECT"] ~= nil) then end dofile (path.join(".." ,"projects", _OPTIONS["PROJECT"], "scripts", "target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua")) end -if (_OPTIONS["SOURCES"] == nil and _OPTIONS["PROJECT"] == nil) then +if (_OPTIONS["SOURCES"] == nil) and (_OPTIONS["PROJECT"] == nil) then if (not os.isfile(path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist") end @@ -1085,9 +1085,9 @@ end "-Wno-array-bounds", "-Wno-error=attributes", -- GCC fails to recognize some uses of [[maybe_unused]] } - if version < 100000 then + if version < 100300 then buildoptions_cpp { - "-flifetime-dse=1", -- GCC 9 takes issue with Sol's get<std::optional<T> >() otherwise + "-flifetime-dse=1", -- GCC 10.2 and earlier take issue with Sol's get<std::optional<T> >() otherwise - possibly an issue with libstdc++ itself } end if version >= 80000 then @@ -1242,6 +1242,9 @@ configuration { "linux-*" } "dl", "rt", } + flags { + "LinkSupportCircularDependencies", + } if _OPTIONS["distro"]=="debian-stable" then defines { @@ -1416,14 +1419,14 @@ if (_OPTIONS["SOURCES"] ~= nil) then local sourceargs = "" for word in string.gmatch(str, '([^,]+)') do if (not os.isfile(path.join(MAME_DIR, word))) then - print("File " .. word.. " does not exist") + print("File " .. word .. " does not exist") os.exit() end sourceargs = sourceargs .. " " .. word end 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 sourcesfilter" .. sourceargs .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"] .. ".flt" ) + os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py sourcesfilter -l " .. MAME_DIR .. "src/" .. _OPTIONS["target"] .. "/" .. _OPTIONS["target"] .. ".lst" .. sourceargs .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"] .. ".flt" ) end group "libs" |