From 471f4db939cb41f79b6101b8eaf55d8f8fd7a318 Mon Sep 17 00:00:00 2001
From: anulax1225 <anulax1225@icloud.com>
Date: Sun, 21 Jan 2024 17:26:15 +0100
Subject: [PATCH] Modified premake config to fix glfw linking errors

---
 bakara/premake5.lua        | 27 ++++++++++++---------------
 bakara/vendor/premake5.lua | 31 ++++++++++++++++++++++++++-----
 premake5.lua               |  1 +
 sandbox/premake5.lua       |  8 ++++++--
 4 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/bakara/premake5.lua b/bakara/premake5.lua
index 66d9057..78395b6 100644
--- a/bakara/premake5.lua
+++ b/bakara/premake5.lua
@@ -1,5 +1,5 @@
 project "bakara"
-    kind "StaticLib"
+    kind "SharedLib"
     language "C++"
     cppdialect "C++17"
     staticruntime "off"
@@ -7,37 +7,34 @@ project "bakara"
     targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
     objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}")
 
-    defines
-	{
-		"_CRT_SECURE_NO_WARNINGS",
-		"GLFW_INCLUDE_NONE"
-	}
+    files 
+    {
+        "src/**.h",
+        "src/**.cpp"
+    }
 
     buildoptions 
     {
-        "-lglfw",
-        "-lGL"
+        "-Wall"
     }
 
-    files 
+    defines 
     {
-        "src/**.h",
-        "src/**.cpp"
+        "GLFW_INCLUDE_NONE"
     }
 
     includedirs 
     {
         "%{IncludeDirs.bakara}",
-        "%{IncludeDirs.glfw}",
         "%{IncludeDirs.glm}",
-        "%{IncludeDirs.spdlog}"
+        "%{IncludeDirs.spdlog}",
+        "%{IncludeDirs.glfw}"
     }
 
     links 
     {
-        "GLFW",
-        "opengl32.lib",
         "glm",
+        "GLFW"
     }
 
     filter "configurations:Debug"
diff --git a/bakara/vendor/premake5.lua b/bakara/vendor/premake5.lua
index eaefee4..a93a0e3 100644
--- a/bakara/vendor/premake5.lua
+++ b/bakara/vendor/premake5.lua
@@ -10,27 +10,31 @@ project "GLFW"
 
 	files
 	{
-		"%{prj.location}/src/glfw_config.h",
-		"%{prj.location}/include/GLFW/glfw3native.h",
-		"%{prj.location}/include/GLFW/glfw3.h",
+		"%{prj.location}/src/internal.h",
+		"%{prj.location}/src/platform.h",
+		"%{prj.location}/src/mappings.h",
 		"%{prj.location}/src/context.c",
 		"%{prj.location}/src/init.c",
 		"%{prj.location}/src/input.c",
 		"%{prj.location}/src/monitor.c",
-		"%{prj.location}/src/vulkan.c",
 		"%{prj.location}/src/window.c",
 		"%{prj.location}/src/platform.c",
+		"%{prj.location}/src/vulkan.c",
 		"%{prj.location}/src/null_init.c",
 		"%{prj.location}/src/null_monitor.c",
 		"%{prj.location}/src/null_window.c",
 		"%{prj.location}/src/null_joystick.c",
+		"%{prj.location}/src/glfw_config.h",
+		"%{prj.location}/include/GLFW/glfw3native.h",
+		"%{prj.location}/include/GLFW/glfw3.h",
+		"include/GLFW/glfw3.h",
+		"include/GLFW/glfw3native.h",
 	}
 
 	filter "system:linux"
 		pic "On"
 
 		systemversion "latest"
-		staticruntime "On"
 
 		files
 		{
@@ -39,6 +43,8 @@ project "GLFW"
 			"%{prj.location}/src/x11_window.c",
 			"%{prj.location}/src/xkb_unicode.c",
 			"%{prj.location}/src/posix_time.c",
+			"%{prj.location}/src/posix_module.c",
+			"%{prj.location}/src/posix_poll.c",
 			"%{prj.location}/src/posix_thread.c",
 			"%{prj.location}/src/glx_context.c",
 			"%{prj.location}/src/egl_context.c",
@@ -46,6 +52,21 @@ project "GLFW"
 			"%{prj.location}/src/linux_joystick.c"
 		}
 
+		links 
+		{
+			"GL",
+			"GLU",
+			"glut",
+			"Xxf86vm",
+			"Xinerama",
+			"Xi",
+			"dl",
+			"X11",
+			"Xrandr",
+			"Xcursor",
+			"pthread"
+		}
+
 		defines
 		{
 			"_GLFW_X11"
diff --git a/premake5.lua b/premake5.lua
index 1729b6a..c159a03 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -18,6 +18,7 @@ IncludeDirs["vendor"] = "%{wks.location}/bakara/vendor"
 IncludeDirs["spdlog"] = "%{wks.location}/bakara/vendor/spdloglib/include"
 IncludeDirs["glm"] = "%{wks.location}/bakara/vendor/glm"
 IncludeDirs["glfw"] = "%{wks.location}/bakara/vendor/glfw/include"
+IncludeDirs["sdl2"] = "%{wks.location}/bakara/vendor/SDL/include"
 
 group "Dependencies"
     include "bakara/vendor"
diff --git a/sandbox/premake5.lua b/sandbox/premake5.lua
index cb56de7..db2afe8 100644
--- a/sandbox/premake5.lua
+++ b/sandbox/premake5.lua
@@ -13,17 +13,21 @@ project "sandbox"
         "src/**.cpp"
     }
 
+    buildoptions 
+    {
+        "-Wall"
+    }
+
     includedirs 
     {
         "%{IncludeDirs.bakara}",
         "%{IncludeDirs.spdlog}",
         "%{IncludeDirs.glm}",
-        ""
     }
 
     links 
     {
-        "bakara"
+        "bakara",
     }