Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake

SHADE_Application/SHADE_Application.vcxproj

@@ -71,8 +71,6 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>spdlogd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
@@ -96,8 +94,6 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>spdlog.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>

SHADE_Application/premake5.lua

@@ -38,23 +38,12 @@ project "SHADE_Application"
     "SHADE_Engine",
   }
 
-  libdirs
-  {
-    "%{IncludeDir.spdlog}/lib",
-  }
-
-  postbuildcommands
-  {
-  }
-
   warnings 'Extra'
   
   filter "configurations:Debug"
     symbols "On"
     defines {"_DEBUG"}
-    links{"spdlogd.lib"}
     
   filter "configurations:Release"
     optimize "On"
     defines{"_RELEASE"}
-    links{"spdlog.lib"}

SHADE_Engine/SHADE_Engine.vcxproj

@@ -71,8 +71,8 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>vulkan-1.lib;shaderc_shared.lib;assimp-vc142-mtd.lib;ktxd.lib;librttr_core_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>vulkan-1.lib;shaderc_shared.lib;assimp-vc142-mtd.lib;librttr_core_d.lib;spdlogd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\ktx\lib\Debug;..\Dependencies\ktx\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImportLibrary>..\bin\Debug\SHADE_Engine.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
@@ -99,8 +99,8 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>vulkan-1.lib;shaderc_shared.lib;assimp-vc142-mt.lib;ktx.lib;librttr_core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>vulkan-1.lib;shaderc_shared.lib;assimp-vc142-mt.lib;librttr_core.lib;spdlog.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\ktx\lib\Debug;..\Dependencies\ktx\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImportLibrary>..\bin\Release\SHADE_Engine.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
@@ -180,7 +180,6 @@
     <ClInclude Include="src\Graphics\Windowing\Surface\SHVkSurface.h" />
     <ClInclude Include="src\Math\SHMath.h" />
     <ClInclude Include="src\Math\SHMathHelpers.h" />
-    <ClInclude Include="src\Math\SHMathHelpers.hpp" />
     <ClInclude Include="src\Math\SHMatrix.h" />
     <ClInclude Include="src\Math\SHQuaternion.h" />
     <ClInclude Include="src\Math\Vector\SHVec2.h" />

SHADE_Engine/SHADE_Engine.vcxproj.filters

@@ -383,7 +383,6 @@
     <ClInclude Include="src\Tools\SHUtilities.h">
       <Filter>Tools</Filter>
     </ClInclude>
-    <ClInclude Include="src\Math\SHMathHelpers.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\ECS_Base\Components\SHComponent.cpp">

SHADE_Engine/premake5.lua

@@ -45,8 +45,7 @@ project "SHADE_Engine"
     "%{IncludeDir.assimp}/lib/Debug",
     "%{IncludeDir.assimp}/lib/Release",
     "%{IncludeDir.RTTR}/lib",
-    "%{IncludeDir.ktx}/lib/Debug",
+    "%{IncludeDir.spdlog}/lib"
-    "%{IncludeDir.ktx}/lib/Release",
   }
   
   links
@@ -93,11 +92,11 @@ project "SHADE_Engine"
   filter "configurations:Debug"
     symbols "On"
     defines {"_DEBUG"}
-    links{"assimp-vc142-mtd.lib", "ktxd.lib", "librttr_core_d.lib"}
+    links{"assimp-vc142-mtd.lib", "librttr_core_d.lib", "spdlogd.lib"}
     --links{"fmodstudioL_vc.lib", "fmodL_vc.lib"}
   
   filter "configurations:Release"
     optimize "On"
     defines{"_RELEASE"}
-    links{"assimp-vc142-mt.lib", "ktx.lib", "librttr_core.lib"}
+    links{"assimp-vc142-mt.lib", "librttr_core.lib", "spdlog.lib"}
     --links{"fmodstudio_vc.lib", "fmod_vc.lib"}