Windows build - premake fix

PixelSenseiAvi · Jun 20, 2023 · 21efdd1 · 21efdd1
1 parent ed2f941
commit 21efdd1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/Walnut/premake5.lua b/Walnut/premake5.lua
@@ -11,10 +11,11 @@ project "Walnut"
    {
       "src",
 
-      "../vendor/imgui",
-      "../vendor/glfw/include",
-      "../vendor/stb_image",
-	"../vendor/glad/include",
+      "vendor/imgui",
+      "vendor/glfw/include",
+      "vendor/stb-image",
+	"vendor/glad/include",
+	"vendor/glm",
 
      -- "%{IncludeDir.VulkanSDK}",
       "%{IncludeDir.glm}",

diff --git a/WalnutApp/imgui.ini b/WalnutApp/imgui.ini
@@ -27,7 +27,7 @@ Collapsed=0
 DockId=0x00000002,0
 
 [Docking][Data]
-DockSpace     ID=0xC0B4127F Window=0x4647B76E Pos=41,96 Size=1600,874 Split=X Selected=0x9B88CA06
+DockSpace     ID=0xC0B4127F Window=0x4647B76E Pos=73,128 Size=1600,874 Split=X Selected=0x9B88CA06
   DockNode    ID=0x00000001 Parent=0xC0B4127F SizeRef=1048,874 Split=X Selected=0x9B88CA06
     DockNode  ID=0x00000002 Parent=0x00000001 SizeRef=1269,874 Selected=0x13926F0B
     DockNode  ID=0x00000004 Parent=0x00000001 SizeRef=329,874 CentralNode=1 Selected=0x9B88CA06

diff --git a/WalnutApp/premake5.lua b/WalnutApp/premake5.lua
@@ -9,9 +9,10 @@ project "WalnutApp"
 
    includedirs
    {
-      "../vendor/imgui",
-      "../vendor/glfw/include",
-	"../vendor/glad/include",
+      "../Walnut/vendor/imgui",
+      "../Walnut/vendor/glfw/include",
+	"../Walnut/vendor/glad/include",
+	"../Walnut/vendor/glm",
 
       "../Walnut/src",
 

diff --git a/WalnutExternal.lua b/WalnutExternal.lua
@@ -1,10 +1,10 @@
 -- WalnutExternal.lua
 
-VULKAN_SDK = os.getenv("VULKAN_SDK")
+--VULKAN_SDK = os.getenv("VULKAN_SDK")
 
 IncludeDir = {}
 --IncludeDir["VulkanSDK"] = "%{VULKAN_SDK}/Include"
-IncludeDir["glm"] = "../vendor/glm"
+IncludeDir["glm"] = "./Walnut/vendor/glm"
 
 LibraryDir = {}
 --LibraryDir["VulkanSDK"] = "%{VULKAN_SDK}/Lib"
@@ -13,9 +13,9 @@ Library = {}
 --Library["Vulkan"] = "%{LibraryDir.VulkanSDK}/vulkan-1.lib"
 
 group "Dependencies"
-   include "vendor/imgui"
-   include "vendor/glfw"
-   include "vendor/glad"
+   include "./Walnut/vendor/imgui"
+   include "./Walnut/vendor/glfw"
+   include "./Walnut/vendor/glad"
 group ""
 
 group "Core"