From a3e4b0a845b36df3b09bc21d2b24f69c7adcb3e5 Mon Sep 17 00:00:00 2001 From: Sri Sham Haran Date: Wed, 14 Sep 2022 09:14:18 +0800 Subject: [PATCH] update premakes for spdlog changes --- SHADE_Application/premake5.lua | 12 ++++++++++-- SHADE_Engine/premake5.lua | 4 +--- premake5.lua | 1 - 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/SHADE_Application/premake5.lua b/SHADE_Application/premake5.lua index 9eb3a41c..8aa03a13 100644 --- a/SHADE_Application/premake5.lua +++ b/SHADE_Application/premake5.lua @@ -14,6 +14,7 @@ project "SHADE_Application" files { "%{prj.location}/src/**.h", + "%{prj.location}/src/**.hpp", "%{prj.location}/src/**.c", "%{prj.location}/src/**.cpp", "%{prj.location}/src/**.glsl", @@ -34,9 +35,14 @@ project "SHADE_Application" links { - "SHADE_Engine" + "SHADE_Engine", } + libdirs + { + "%{IncludeDir.spdlog}/lib", + } + postbuildcommands { } @@ -46,7 +52,9 @@ project "SHADE_Application" filter "configurations:Debug" symbols "On" defines {"_DEBUG"} + links{"spdlogd.lib"} filter "configurations:Release" optimize "On" - defines{"_RELEASE"} \ No newline at end of file + defines{"_RELEASE"} + links{"spdlog.lib"} diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua index 681de634..841eaab3 100644 --- a/SHADE_Engine/premake5.lua +++ b/SHADE_Engine/premake5.lua @@ -35,7 +35,7 @@ project "SHADE_Engine" "%{IncludeDir.RTTR}/include", "%{IncludeDir.reactphysics3d}/include", "%{IncludeDir.VULKAN}/include", - "%{IncludeDir.VULKAN}/Source/SPIRV-Reflect" + "%{IncludeDir.VULKAN}/Source/SPIRV-Reflect" } libdirs @@ -56,7 +56,6 @@ project "SHADE_Engine" "msdf-atlas-gen", "reactphysics3d", "imgui", - "spdlog", "vulkan-1.lib", "shaderc_shared.lib" } @@ -82,7 +81,6 @@ project "SHADE_Engine" "msdf-atlas-gen", "reactphysics3d", "imgui", - "spdlog", } warnings 'Extra' diff --git a/premake5.lua b/premake5.lua index e136702a..45ed41fa 100644 --- a/premake5.lua +++ b/premake5.lua @@ -24,7 +24,6 @@ workspace "SHADE" group "Dependencies" include "Dependencies/msdf" include "Dependencies/imgui" - include "Dependencies/spdlog" --include "Dependencies/tracy" include "Dependencies/yamlcpp" include "Dependencies/reactphysics3d"