From 9246a5050aaa2041aeff872b89ecaef219809121 Mon Sep 17 00:00:00 2001
From: Jamie Reece Wilson <me@reece.sx>
Date: Sat, 9 Dec 2023 22:10:43 +0000
Subject: [PATCH] [+] Aurora.Settings.sRelRootInclude

---
 Core/project.lua    | 2 +-
 Public/paths.lua    | 7 +++----
 Public/settings.lua | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Core/project.lua b/Core/project.lua
index ac727f9..79dd8dd 100644
--- a/Core/project.lua
+++ b/Core/project.lua
@@ -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*")
diff --git a/Public/paths.lua b/Public/paths.lua
index 9b3f011..2929b5d 100644
--- a/Public/paths.lua
+++ b/Public/paths.lua
@@ -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")
diff --git a/Public/settings.lua b/Public/settings.lua
index b7ecccc..a2502a9 100644
--- a/Public/settings.lua
+++ b/Public/settings.lua
@@ -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)