[*] Amended bStaticRuntime on Linux and Windows

[+] Aurora.Settings.bBasicMitigations for Windows
This commit is contained in:
Reece Wilson 2023-08-27 12:45:28 +01:00 committed by Jamie Reece Wilson
parent eb29d1311d
commit ef1d2633e5
3 changed files with 30 additions and 4 deletions

View File

@ -115,16 +115,34 @@ local function configureProjectForCompiler()
end end
local function configureProjectForPlatform(platform, projectType) local function configureProjectForPlatform(platform, projectType)
if (platform == "win32") then if (platform == "linux") then
if (Aurora.Settings.bStaticRuntime) then
buildoptions "-static"
linkoptions "-l:libc++abi.a"
linkoptions "-l:libc++.a"
linkoptions "-Wl,--as-needed"
end
end
if (platform == "win32") then
characterset(Aurora.Settings.sMsvcDefCharset) characterset(Aurora.Settings.sMsvcDefCharset)
if (Aurora.Settings.bStaticRuntime) then if (Aurora.Settings.bStaticRuntime) then
staticruntime("On") staticruntime("On")
links "libucrt.lib"
else else
staticruntime("Off") staticruntime("Off")
end end
if (not Aurora.Settings.bBasicMitigations) then
buildoptions {
--"/GS-",
"/sdl-"
}
flags "NoBufferSecurityCheck"
end
if (Aurora.Settings.bHotswap) then if (Aurora.Settings.bHotswap) then
justmycode("On") justmycode("On")
else else

View File

@ -64,12 +64,19 @@ local function auStartSolution(sln)
auFilter { "toolset:clang"} auFilter { "toolset:clang"}
linkoptions {"-nodefaultlibs"} linkoptions {"-nodefaultlibs"}
links {"c++", links {
"c++abi",
"m", "m",
"c", "c",
"gcc_s", "gcc_s",
"gcc"} "gcc"
}
if (Aurora.Settings.bStaticRuntime) then
links {
"c++",
"c++abi"
}
end
auFilter {} auFilter {}
end end
end end

View File

@ -97,6 +97,7 @@ auSetDefault(settings, "bDefinePartialABIInTargetName", true)
auSetDefault(settings, "bStaticRuntime", true) auSetDefault(settings, "bStaticRuntime", true)
auSetDefault(settings, "bBasicMitigations", true)
-- --
auSetDefault(settings, "bLTO", false) auSetDefault(settings, "bLTO", false)