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

[+] Aurora.Settings.sRelRootInclude

Browse Source
This commit is contained in:
Reece Wilson 2023-12-09 22:10:43 +00:00
parent e88edaa74e
commit 9246a5050a
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/project.lua
View File

@ -389,7 +389,7 @@ local function setupProject(prj)
} }
if (Aurora.Settings.bIncludeAuIncludeIfExists) then if (Aurora.Settings.bIncludeAuIncludeIfExists) then
local commonInclude = auGetRoot() .. "/Include" local commonInclude = Aurora.Settings.sAbsRootInclude
if (os.isdir(commonInclude)) then if (os.isdir(commonInclude)) then
includedirs(commonInclude) includedirs(commonInclude)
files(commonInclude .. "/**.h*") files(commonInclude .. "/**.h*")

7
Public/paths.lua
View File

@ -13,9 +13,9 @@ end
local function resolvePathAbs2(key, rootKey) local function resolvePathAbs2(key, rootKey)
local val = auGetSetting(key) local val = auGetSetting(key)
if (not val) then return end if (not val) then return end
local path = auGetSetting(rootKey) .. val local path = os.realpath(auGetSetting(rootKey) .. val)
local key2 = "sAbs" .. key:sub(5) local key2 = "sAbs" .. key:sub(5)
if (Aurora.Settings[key2]) then return end if (Aurora.Settings[key2]) then return Aurora.Settings[key2] end
Aurora.Settings[key2] = path Aurora.Settings[key2] = path
return path return path
end end
@ -32,7 +32,6 @@ local function resolvePathAbs(key)
end end
end end
resolvePathAbs("sRelDebug") resolvePathAbs("sRelDebug")
resolvePathAbs("sRelStage") resolvePathAbs("sRelStage")
resolvePathAbs("sRelShip") resolvePathAbs("sRelShip")
@ -40,7 +39,7 @@ resolvePathAbs("sRelWd")
resolvePathAbs("sRelSymbols") resolvePathAbs("sRelSymbols")
resolvePathAbs("sRelLinkLibs") resolvePathAbs("sRelLinkLibs")
resolvePathAbs("sRelCompilerWd") resolvePathAbs("sRelCompilerWd")
resolvePathAbs("sRelRootInclude")
local function resolveAuPathAbs(key) local function resolveAuPathAbs(key)
return resolvePathAbs2(key, "sAbsAuRoot") return resolvePathAbs2(key, "sAbsAuRoot")

2
Public/settings.lua
View File

@ -51,6 +51,8 @@ auSetDefault(settings, "sRelAuRoot" , "./")
auSetDefault(settings, "sRelLinkLibs" , "./Build/Link") -- public link files auSetDefault(settings, "sRelLinkLibs" , "./Build/Link") -- public link files
auSetDefault(settings, "sRelCompilerWd" , "./Build/Workspace") auSetDefault(settings, "sRelCompilerWd" , "./Build/Workspace")
auSetDefault(settings, "sRelRootInclude" , "./Include")
-- When enabled, debug run targets shall run under the modules path instead of sRelWd -- When enabled, debug run targets shall run under the modules path instead of sRelWd
auSetDefault(settings, "bIsBuildDirWd" , false) auSetDefault(settings, "bIsBuildDirWd" , false)