[+] Aurora.Settings.sRelRootInclude
This commit is contained in:
parent
e88edaa74e
commit
9246a5050a
@ -389,7 +389,7 @@ local function setupProject(prj)
|
||||
}
|
||||
|
||||
if (Aurora.Settings.bIncludeAuIncludeIfExists) then
|
||||
local commonInclude = auGetRoot() .. "/Include"
|
||||
local commonInclude = Aurora.Settings.sAbsRootInclude
|
||||
if (os.isdir(commonInclude)) then
|
||||
includedirs(commonInclude)
|
||||
files(commonInclude .. "/**.h*")
|
||||
|
@ -13,9 +13,9 @@ end
|
||||
local function resolvePathAbs2(key, rootKey)
|
||||
local val = auGetSetting(key)
|
||||
if (not val) then return end
|
||||
local path = auGetSetting(rootKey) .. val
|
||||
local path = os.realpath(auGetSetting(rootKey) .. val)
|
||||
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
|
||||
return path
|
||||
end
|
||||
@ -32,7 +32,6 @@ local function resolvePathAbs(key)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
resolvePathAbs("sRelDebug")
|
||||
resolvePathAbs("sRelStage")
|
||||
resolvePathAbs("sRelShip")
|
||||
@ -40,7 +39,7 @@ resolvePathAbs("sRelWd")
|
||||
resolvePathAbs("sRelSymbols")
|
||||
resolvePathAbs("sRelLinkLibs")
|
||||
resolvePathAbs("sRelCompilerWd")
|
||||
|
||||
resolvePathAbs("sRelRootInclude")
|
||||
|
||||
local function resolveAuPathAbs(key)
|
||||
return resolvePathAbs2(key, "sAbsAuRoot")
|
||||
|
@ -51,6 +51,8 @@ auSetDefault(settings, "sRelAuRoot" , "./")
|
||||
auSetDefault(settings, "sRelLinkLibs" , "./Build/Link") -- public link files
|
||||
auSetDefault(settings, "sRelCompilerWd" , "./Build/Workspace")
|
||||
|
||||
auSetDefault(settings, "sRelRootInclude" , "./Include")
|
||||
|
||||
-- When enabled, debug run targets shall run under the modules path instead of sRelWd
|
||||
auSetDefault(settings, "bIsBuildDirWd" , false)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user