From eb993d3244f05cc4f97ae1521877c612d1070272 Mon Sep 17 00:00:00 2001
From: anulax1225 <anulax1225@icloud.com>
Date: Wed, 17 Jan 2024 19:52:32 +0100
Subject: [PATCH] Modified premake config for spdlog and glm git modules

---
 bakara/premake5.lua        |  5 +++--
 bakara/vendor/premake5.lua | 10 +++++-----
 premake5.lua               |  6 ++++++
 sandbox/premake5.lua       |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/bakara/premake5.lua b/bakara/premake5.lua
index 8e5ec87..d2f3e05 100644
--- a/bakara/premake5.lua
+++ b/bakara/premake5.lua
@@ -15,8 +15,9 @@ project "bakara"
 
     includedirs 
     {
-        "src",
-        "vendor"
+        "%{IncludeDirs.bakara}",
+        "%{IncludeDirs.glm}",
+        "%{IncludeDirs.spdlog}"
     }
 
     links 
diff --git a/bakara/vendor/premake5.lua b/bakara/vendor/premake5.lua
index dfb0f66..0a7ebad 100644
--- a/bakara/vendor/premake5.lua
+++ b/bakara/vendor/premake5.lua
@@ -1,5 +1,5 @@
 project "glm"
-    location "glm"
+    location "glm/glm"
     kind "StaticLib"
     language "C++"
     cppdialect "C++17"
@@ -10,12 +10,12 @@ project "glm"
 
     files 
     {
-        "glm/**.hpp",
-        "glm/**.inl",
-        "glm/**.cpp"
+        "%{prj.location}/**.hpp",
+        "%{prj.location}/**.inl",
+        "%{prj.location}/**.cpp"
     }
 
     includedirs 
     {
-        "%{wks.location}/bakara/vendor"
+        "%{IncludeDirs.glm}"
     }
diff --git a/premake5.lua b/premake5.lua
index c74e330..d66ba40 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -5,6 +5,12 @@ workspace "Bakara"
 
     outputdir = "%{cfg.system}-%{cfg.architecture}-%{cfg.buildcfg}"
 
+    IncludeDirs = {}
+    IncludeDirs["bakara"] = "%{wks.location}/bakara/src"
+    IncludeDirs["vendor"] = "%{wks.location}/bakara/vendor"
+    IncludeDirs["spdlog"] = "%{wks.location}/bakara/vendor/spdloglib/include"
+    IncludeDirs["glm"] = "%{wks.location}/bakara/vendor/glm"
+
 group "Dependencies"
     include "bakara/vendor"
 group ""
diff --git a/sandbox/premake5.lua b/sandbox/premake5.lua
index d65dbc0..4adde23 100644
--- a/sandbox/premake5.lua
+++ b/sandbox/premake5.lua
@@ -16,8 +16,8 @@ project "sandbox"
 
     includedirs 
     {
-        "%{wks.location}/bakara/vendor",
-        "%{wks.location}/bakara/src"
+        "%{IncludeDirs.bakara}",
+        "%{IncludeDirs.spdlog}"
     }
 
     links