Merge remote-tracking branch 'origin/main' into main

SHADE_Engine/SHADE_Engine.vcxproj

@@ -77,7 +77,8 @@
       <ImportLibrary>..\bin\Debug\SHADE_Engine.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy  /s /r /y /q "$(SolutionDir)/Dependencies/spdlog/bin" "$(OutDir)"</Command>
+      <Command>xcopy  /s /r /y /q "$(SolutionDir)/Dependencies/spdlog/bin" "$(OutDir)"
+xcopy  /r /y /q "$(SolutionDir)/Dependencies/SDL/lib/SDL2.dll" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -106,7 +107,8 @@
       <ImportLibrary>..\bin\Release\SHADE_Engine.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy  /s /r /y /q "$(SolutionDir)/Dependencies/spdlog/bin" "$(OutDir)"</Command>
+      <Command>xcopy  /s /r /y /q "$(SolutionDir)/Dependencies/spdlog/bin" "$(OutDir)"
+xcopy  /r /y /q "$(SolutionDir)/Dependencies/SDL/lib/SDL2.dll" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -124,8 +126,8 @@
     <ClInclude Include="src\ECS_Base\System\SHSystem.h" />
     <ClInclude Include="src\ECS_Base\System\SHSystemManager.h" />
     <ClInclude Include="src\Engine\SHEngine.h" />
-    <ClInclude Include="src\Filesystem\SHFileSystem.h" />
     <ClInclude Include="src\FRC\SHFramerateController.h" />
+    <ClInclude Include="src\Filesystem\SHFileSystem.h" />
     <ClInclude Include="src\Graphics\Buffers\SHVkBuffer.h" />
     <ClInclude Include="src\Graphics\Commands\SHCommandPoolResetMode.h" />
     <ClInclude Include="src\Graphics\Commands\SHVkCommandBuffer.h" />
@@ -212,8 +214,8 @@
     <ClCompile Include="src\ECS_Base\System\SHEntityManager.cpp" />
     <ClCompile Include="src\ECS_Base\System\SHSystemManager.cpp" />
     <ClCompile Include="src\Engine\SHEngine.cpp" />
-    <ClCompile Include="src\Filesystem\SHFileSystem.cpp" />
     <ClCompile Include="src\FRC\SHFramerateController.cpp" />
+    <ClCompile Include="src\Filesystem\SHFileSystem.cpp" />
     <ClCompile Include="src\Graphics\Buffers\SHVkBuffer.cpp" />
     <ClCompile Include="src\Graphics\Commands\SHVkCommandBuffer.cpp" />
     <ClCompile Include="src\Graphics\Commands\SHVkCommandPool.cpp" />

SHADE_Engine/SHADE_Engine.vcxproj.filters

@@ -19,6 +19,9 @@
     <Filter Include="Engine">
       <UniqueIdentifier>{DBC7D3B0-C769-FE86-B024-12DB9C6585D7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="FRC">
+      <UniqueIdentifier>{80E7870B-ECF0-877C-756C-9E7CE174937C}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Filesystem">
       <UniqueIdentifier>{8A8E2B37-7646-6D84-DF4D-46E0CB240875}</UniqueIdentifier>
     </Filter>
@@ -159,6 +162,9 @@
     <ClInclude Include="src\Engine\SHEngine.h">
       <Filter>Engine</Filter>
     </ClInclude>
+    <ClInclude Include="src\FRC\SHFramerateController.h">
+      <Filter>FRC</Filter>
+    </ClInclude>
     <ClInclude Include="src\Filesystem\SHFileSystem.h">
       <Filter>Filesystem</Filter>
     </ClInclude>
@@ -387,7 +393,6 @@
     <ClInclude Include="src\Tools\SHUtilities.h">
       <Filter>Tools</Filter>
     </ClInclude>
-    <ClInclude Include="src\FRC\SHFramerateController.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\ECS_Base\Components\SHComponent.cpp">
@@ -411,6 +416,9 @@
     <ClCompile Include="src\Engine\SHEngine.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
+    <ClCompile Include="src\FRC\SHFramerateController.cpp">
+      <Filter>FRC</Filter>
+    </ClCompile>
     <ClCompile Include="src\Filesystem\SHFileSystem.cpp">
       <Filter>Filesystem</Filter>
     </ClCompile>
@@ -592,6 +600,5 @@
     <ClCompile Include="src\Tools\SHLogger.cpp">
       <Filter>Tools</Filter>
     </ClCompile>
-    <ClCompile Include="src\FRC\SHFramerateController.cpp" />
   </ItemGroup>
 </Project>

SHADE_Engine/premake5.lua

@@ -93,7 +93,8 @@ project "SHADE_Engine"
 
   postbuildcommands 
   {
-    "xcopy  /s /r /y /q \"%{IncludeDir.spdlog}/bin\" \"$(OutDir)\""
+    "xcopy  /s /r /y /q \"%{IncludeDir.spdlog}/bin\" \"$(OutDir)\"",
+    "xcopy  /r /y /q \"%{IncludeDir.SDL}/lib/SDL2.dll\" \"$(OutDir)\""
   }
 
   warnings 'Extra'