From fe978daa9d22e9294aff3a8f758c404fa42d1bf7 Mon Sep 17 00:00:00 2001
From: hispidence <squidshirehimself@gmail.com>
Date: Sun, 23 Jan 2022 17:47:55 +0000
Subject: [PATCH] Move GameScriptSettings over to Scripting.

---
 Scripting/Scripting.vcxproj                        | 14 ++++++++++++--
 Scripting/Scripting.vcxproj.filters                | 12 ++++++++++++
 .../include}/GameScriptSettings.h                  |  0
 .../src}/GameScriptSettings.cpp                    |  0
 TR5Main/TombEngine.vcxproj                         | 10 ----------
 TR5Main/TombEngine.vcxproj.filters                 |  4 ----
 6 files changed, 24 insertions(+), 16 deletions(-)
 rename {TR5Main/Scripting => Scripting/include}/GameScriptSettings.h (100%)
 rename {TR5Main/Scripting => Scripting/src}/GameScriptSettings.cpp (100%)

diff --git a/Scripting/Scripting.vcxproj b/Scripting/Scripting.vcxproj
index d324a85be..a47594dc2 100644
--- a/Scripting/Scripting.vcxproj
+++ b/Scripting/Scripting.vcxproj
@@ -32,8 +32,10 @@
     <ClInclude Include="include\GameScriptNamedBase.h" />
     <ClInclude Include="include\GameScriptPosition.h" />
     <ClInclude Include="include\GameScriptRotation.h" />
+    <ClInclude Include="include\GameScriptSettings.h" />
     <ClInclude Include="include\GameScriptSinkInfo.h" />
     <ClInclude Include="include\GameScriptSkyLayer.h" />
+    <ClInclude Include="include\GameScriptSoundSourceInfo.h" />
     <ClInclude Include="include\ItemEnumPair.h" />
     <ClInclude Include="include\ReservedScriptNames.h" />
     <ClInclude Include="include\ScriptAssert.h" />
@@ -55,8 +57,10 @@
     <ClCompile Include="src\GameScriptMirror.cpp" />
     <ClCompile Include="src\GameScriptPosition.cpp" />
     <ClCompile Include="src\GameScriptRotation.cpp" />
+    <ClCompile Include="src\GameScriptSettings.cpp" />
     <ClCompile Include="src\GameScriptSinkInfo.cpp" />
     <ClCompile Include="src\GameScriptSkyLayer.cpp" />
+    <ClCompile Include="src\GameScriptSoundSourceInfo.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -135,7 +139,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NOMINMAX;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NOMINMAX;SPDLOG_COMPILED_LIB;</PreprocessorDefinitions>
       <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>frameworkandsol.h</PrecompiledHeaderFile>
@@ -147,6 +151,9 @@
       </SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -154,7 +161,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NOMINMAX;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NOMINMAX;SPDLOG_COMPILED_LIB;</PreprocessorDefinitions>
       <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>frameworkandsol.h</PrecompiledHeaderFile>
@@ -168,6 +175,9 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
diff --git a/Scripting/Scripting.vcxproj.filters b/Scripting/Scripting.vcxproj.filters
index e7d345a84..a2c5a5aef 100644
--- a/Scripting/Scripting.vcxproj.filters
+++ b/Scripting/Scripting.vcxproj.filters
@@ -72,6 +72,12 @@
     <ClInclude Include="include\ReservedScriptNames.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\GameScriptSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\GameScriptSoundSourceInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="frameworkandsol.cpp">
@@ -113,6 +119,12 @@
     <ClCompile Include="src\GameScriptDisplayString.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\GameScriptSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\GameScriptSoundSourceInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/TR5Main/Scripting/GameScriptSettings.h b/Scripting/include/GameScriptSettings.h
similarity index 100%
rename from TR5Main/Scripting/GameScriptSettings.h
rename to Scripting/include/GameScriptSettings.h
diff --git a/TR5Main/Scripting/GameScriptSettings.cpp b/Scripting/src/GameScriptSettings.cpp
similarity index 100%
rename from TR5Main/Scripting/GameScriptSettings.cpp
rename to Scripting/src/GameScriptSettings.cpp
diff --git a/TR5Main/TombEngine.vcxproj b/TR5Main/TombEngine.vcxproj
index e6bcd58c2..3798441e2 100644
--- a/TR5Main/TombEngine.vcxproj
+++ b/TR5Main/TombEngine.vcxproj
@@ -457,8 +457,6 @@ CALL gen.bat</Command>
     <ClInclude Include="Renderer\RenderPipelineState\RenderPipelineState.h" />
     <ClInclude Include="Scripting\AudioTracks.h" />
     <ClInclude Include="Scripting\GameScriptLevel.h" />
-    <ClInclude Include="Scripting\GameScriptSettings.h" />
-    <ClInclude Include="Scripting\GameScriptSoundSourceInfo.h" />
     <ClInclude Include="Scripting\InventorySlots.h" />
     <ClInclude Include="Scripting\LanguageScript.h" />
     <ClInclude Include="Renderer\Renderer11.h" />
@@ -863,14 +861,6 @@ CALL gen.bat</Command>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="Scripting\GameScriptSettings.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="Scripting\GameScriptSoundSourceInfo.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
-    </ClCompile>
     <ClCompile Include="Scripting\GameScriptItemInfo.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">frameworkandsol.h</PrecompiledHeaderFile>
diff --git a/TR5Main/TombEngine.vcxproj.filters b/TR5Main/TombEngine.vcxproj.filters
index 5af30a20a..57449aad3 100644
--- a/TR5Main/TombEngine.vcxproj.filters
+++ b/TR5Main/TombEngine.vcxproj.filters
@@ -286,8 +286,6 @@
     <ClCompile Include="Objects\TR5\Object\tr5_expandingplatform.cpp" />
     <ClCompile Include="Scripting\GameFlowScript.cpp" />
     <ClCompile Include="Scripting\GameScriptLevel.cpp" />
-    <ClCompile Include="Scripting\GameScriptSettings.cpp" />
-    <ClCompile Include="Scripting\GameScriptSoundSourceInfo.cpp" />
     <ClCompile Include="Scripting\GameScriptItemInfo.cpp" />
     <ClCompile Include="Scripting\GameLogicScript.cpp" />
     <ClCompile Include="Scripting\LuaHandler.cpp" />
@@ -603,8 +601,6 @@
     <ClInclude Include="Renderer\RenderPipelineState\RenderPipelineState.h" />
     <ClInclude Include="Scripting\AudioTracks.h" />
     <ClInclude Include="Scripting\GameScriptLevel.h" />
-    <ClInclude Include="Scripting\GameScriptSettings.h" />
-    <ClInclude Include="Scripting\GameScriptSoundSourceInfo.h" />
     <ClInclude Include="Scripting\InventorySlots.h" />
     <ClInclude Include="Scripting\LanguageScript.h" />
     <ClInclude Include="Renderer\Renderer11.h" />