From 6d155ced6134d20a4b153569ab59f94077831159 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Sun, 17 Jan 2021 10:11:57 +1100
Subject: [PATCH] Updated VS projectfiles for recent changes

- Adding the Match History viewer
- Removing utils/optional_fwd.hpp
- Adding the wesnothd game history query handling
---
 projectfiles/VC16/wesnoth.vcxproj          | 11 +++++++++--
 projectfiles/VC16/wesnoth.vcxproj.filters  | 11 +++++++----
 projectfiles/VC16/wesnothd.vcxproj         | 18 ++++++++++++------
 projectfiles/VC16/wesnothd.vcxproj.filters |  6 ++++++
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/projectfiles/VC16/wesnoth.vcxproj b/projectfiles/VC16/wesnoth.vcxproj
index b165822fdec2..6d66ee009499 100644
--- a/projectfiles/VC16/wesnoth.vcxproj
+++ b/projectfiles/VC16/wesnoth.vcxproj
@@ -1709,6 +1709,13 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|x64'">$(IntDir)Gui\Dialogs\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|x64'">$(IntDir)Gui\Dialogs\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\multiplayer\match_history.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|x64'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|x64'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\src\gui\dialogs\server_info_dialog.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Gui\Dialogs\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Gui\Dialogs\</ObjectFileName>
@@ -3849,6 +3856,7 @@
     <ClInclude Include="..\..\src\gui\dialogs\modeless_dialog.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\faction_select.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\lobby.hpp" />
+    <ClInclude Include="..\..\src\gui\dialogs\multiplayer\match_history.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\mp_alerts_options.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\mp_change_control.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\mp_connect.hpp" />
@@ -4143,7 +4151,6 @@
     <ClInclude Include="..\..\src\utils\math.hpp" />
     <ClInclude Include="..\..\src\utils\name_generator.hpp" />
     <ClInclude Include="..\..\src\utils\name_generator_factory.hpp" />
-    <ClInclude Include="..\..\src\utils\optional_fwd.hpp" />
     <ClInclude Include="..\..\src\utils\parse_network_address.hpp" />
     <ClInclude Include="..\..\src\utils\reference_counter.hpp" />
     <ClInclude Include="..\..\src\utils\scope_exit.hpp" />
@@ -4193,4 +4200,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/projectfiles/VC16/wesnoth.vcxproj.filters b/projectfiles/VC16/wesnoth.vcxproj.filters
index 5285d1204e4e..918391fd392f 100644
--- a/projectfiles/VC16/wesnoth.vcxproj.filters
+++ b/projectfiles/VC16/wesnoth.vcxproj.filters
@@ -1593,6 +1593,9 @@
     <ClCompile Include="..\..\src\preferences\advanced.cpp">
       <Filter>Preferences</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\multiplayer\match_history.cpp">
+      <Filter>Gui\Dialogs\Multiplayer</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\addon\client.hpp">
@@ -3090,12 +3093,12 @@
     <ClInclude Include="..\..\src\units\orb_status.hpp">
       <Filter>Units</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\optional_fwd.hpp">
-      <Filter>utils</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\preferences\advanced.hpp">
       <Filter>Preferences</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\gui\dialogs\multiplayer\match_history.hpp">
+      <Filter>Gui\Dialogs\Multiplayer</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\tests\test_sdl_utils.hpp">
@@ -3117,4 +3120,4 @@
       <Filter>Tests\Utils</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/projectfiles/VC16/wesnothd.vcxproj b/projectfiles/VC16/wesnothd.vcxproj
index c97919cbc069..5415905aa491 100644
--- a/projectfiles/VC16/wesnothd.vcxproj
+++ b/projectfiles/VC16/wesnothd.vcxproj
@@ -173,6 +173,11 @@
   <ItemGroup>
     <ClCompile Include="..\..\src\mt_rng.cpp" />
     <ClCompile Include="..\..\src\seed_rng.cpp" />
+    <ClCompile Include="..\..\src\server\common\resultsets\game_history.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\Server\Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)\Server\Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\Server\Common\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\src\server\wesnothd\ban.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
@@ -199,14 +204,14 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\src\server\common\resultsets\tournaments.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\Common\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\src\server\common\resultsets\ban_check.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|x64'">$(IntDir)Server\Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Server\Common\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\src\server\wesnothd\player.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)Server\</ObjectFileName>
@@ -251,6 +256,7 @@
     <ClInclude Include="..\..\src\server\common\dbconn.hpp" />
     <ClInclude Include="..\..\src\server\common\forum_user_handler.hpp" />
     <ClInclude Include="..\..\src\server\common\resultsets\ban_check.hpp" />
+    <ClInclude Include="..\..\src\server\common\resultsets\game_history.hpp" />
     <ClInclude Include="..\..\src\server\common\resultsets\rs_base.hpp" />
     <ClInclude Include="..\..\src\server\common\resultsets\tournaments.hpp" />
     <ClInclude Include="..\..\src\server\common\server_base.hpp" />
diff --git a/projectfiles/VC16/wesnothd.vcxproj.filters b/projectfiles/VC16/wesnothd.vcxproj.filters
index e01ce1d12144..cddf3887229d 100644
--- a/projectfiles/VC16/wesnothd.vcxproj.filters
+++ b/projectfiles/VC16/wesnothd.vcxproj.filters
@@ -77,6 +77,9 @@
     <ClCompile Include="..\..\src\server\common\user_handler.cpp">
       <Filter>Server\Common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\server\common\resultsets\game_history.cpp">
+      <Filter>Server\Common\Resultsets</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\mt_rng.hpp" />
@@ -126,5 +129,8 @@
     <ClInclude Include="..\..\src\server\common\user_handler.hpp">
       <Filter>Server\Common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\server\common\resultsets\game_history.hpp">
+      <Filter>Server\Common\Resultsets</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file