AuroraPipeline/Build
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[*] Linux Fixes

Browse Source 
[*] Update readme
[*] Fix single arch sln regression
This commit is contained in:
Reece Wilson 2022-03-20 10:04:05 +00:00
parent 431fe2afc5
commit 7f9e6b0493
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/BuildHooks/BuildHooks.lua
View File

@ -67,7 +67,7 @@ local function addUserDestCopy(name, type, config, platformName, arch, dir)
platform.devChainSupportsElfStrip and platform.devChainSupportsElfStrip and
config ~= Aurora.Settings.sNameOfDebug) then config ~= Aurora.Settings.sNameOfDebug) then
local debugSymbolPath = normalizeCpyPath(Aurora.Settings.sAbsSymbols) .. "/" .. name .. ".dwarf" local debugSymbolPath = normalizeCpyPath(Aurora.Settings.sAbsSymbols) .. "/" .. name .. ".dwarf"
postbuildcommands("objcopy --strip-debug \"" .. file .. "\" \"" .. outputPath .. "\\") postbuildcommands("objcopy --strip-debug \"" .. file .. "\" \"" .. outputPath .. "\"")
if (Aurora.Settings.bUseAuBuildHooks and config ~= Aurora.Settings.sNameOfShip) then if (Aurora.Settings.bUseAuBuildHooks and config ~= Aurora.Settings.sNameOfShip) then
postbuildcommands("objcopy --add-gnu-debuglink=\"" .. debugSymbolPath .. "\" \"" .. outputPath .. "\"") postbuildcommands("objcopy --add-gnu-debuglink=\"" .. debugSymbolPath .. "\" \"" .. outputPath .. "\"")
end end

22
Core/solution.lua
View File

@ -37,16 +37,22 @@ local function auStartSolution(sln)
} }
end end
if (Aurora.Settings.bForceClangWin32) then auFilterForPlatforms(function(platform)
auFilterForPlatforms(function(platform) if (platform == "win32") then
if (platform == "win32") then if (not Aurora.Settings.bForceClangWin32) then
toolset "clang"
else
toolset "msc" toolset "msc"
else
toolset "clang"
end end
end) else
end if (not Aurora.Settings.bForceClangOnUnix) then
toolset "gcc"
else
toolset "clang"
end
end
end)
if (Aurora.Settings.bForceLLVMStl) then if (Aurora.Settings.bForceLLVMStl) then
filter {"files:**.cpp or files:**.cc or files:**.cxx", "toolset:clang"} filter {"files:**.cpp or files:**.cc or files:**.cxx", "toolset:clang"}
buildoptions {"-stdlib=libc++"} buildoptions {"-stdlib=libc++"}

2
Public/settings.lua
View File

@ -109,6 +109,8 @@ auSetDefault(settings, "bForceClangWin32", false)
-- G++ is a mess whose future I don't care for. Not that libc++ doesn't do stupid thing on Linux, but au runtime takes care of a lot of things, so idc. -- G++ is a mess whose future I don't care for. Not that libc++ doesn't do stupid thing on Linux, but au runtime takes care of a lot of things, so idc.
auSetDefault(settings, "bForceLLVMStl", true) auSetDefault(settings, "bForceLLVMStl", true)
auSetDefault(settings, "bForceClangOnUnix", true)
auSetDefault(settings, "bForceWin32EscLd", true) auSetDefault(settings, "bForceWin32EscLd", true)
-- Premake5 binary name to look for when when tied into cmake. Used by build actions and other lua scripted features -- Premake5 binary name to look for when when tied into cmake. Used by build actions and other lua scripted features