Update VC project files to correspond with PR #645 being merged.

wesnoth · Jun 1, 2016 · c8c1e75 · c8c1e75
1 parent 2f73681
commit c8c1e75
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 16 deletions.
diff --git a/projectfiles/VC12/wesnoth.vcxproj b/projectfiles/VC12/wesnoth.vcxproj
@@ -1113,6 +1113,9 @@
     <ClCompile Include="..\..\src\fake_unit_manager.cpp" />
     <ClCompile Include="..\..\src\fake_unit_ptr.cpp" />
     <ClCompile Include="..\..\src\filechooser.cpp" />
+    <ClCompile Include="..\..\src\filesystem_boost.cpp" />
+    <ClCompile Include="..\..\src\filesystem_common.cpp" />
+    <ClCompile Include="..\..\src\filesystem_sdl.cpp" />
     <ClCompile Include="..\..\src\floating_label.cpp" />
     <ClCompile Include="..\..\src\floating_textbox.cpp" />
     <ClCompile Include="..\..\src\font.cpp" />

diff --git a/projectfiles/VC12/wesnoth.vcxproj.filters b/projectfiles/VC12/wesnoth.vcxproj.filters
@@ -1389,6 +1389,9 @@
     <ClCompile Include="..\..\src\fake_unit_manager.cpp" />
     <ClCompile Include="..\..\src\fake_unit_ptr.cpp" />
     <ClCompile Include="..\..\src\filechooser.cpp" />
+    <ClCompile Include="..\..\src\filesystem_boost.cpp" />
+    <ClCompile Include="..\..\src\filesystem_common.cpp" />
+    <ClCompile Include="..\..\src\filesystem_sdl.cpp" />
     <ClCompile Include="..\..\src\floating_label.cpp" />
     <ClCompile Include="..\..\src\floating_textbox.cpp" />
     <ClCompile Include="..\..\src\font.cpp" />

diff --git a/projectfiles/VC12/wesnothd.vcxproj b/projectfiles/VC12/wesnothd.vcxproj
@@ -205,7 +205,12 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\server\forum_user_handler.cpp" />
+    <ClCompile Include="..\..\src\server\forum_user_handler.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\src\server\game.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
@@ -230,16 +235,36 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\server\player_network.cpp" />
-    <ClCompile Include="..\..\src\server\proxy.cpp">
+    <ClCompile Include="..\..\src\server\player_connection.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\src\server\player_network.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\src\server\room.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\src\server\room_manager.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\src\server\sample_user_handler.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\server\room.cpp" />
-    <ClCompile Include="..\..\src\server\room_manager.cpp" />
-    <ClCompile Include="..\..\src\server\sample_user_handler.cpp" />
     <ClCompile Include="..\..\src\server\server.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
@@ -253,10 +278,14 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\server\user_handler.cpp" />
+    <ClCompile Include="..\..\src\server\user_handler.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\global.hpp" />
     <ClInclude Include="..\..\src\mt_rng.hpp" />
     <ClInclude Include="..\..\src\seed_rng.hpp" />
     <ClInclude Include="..\..\src\server\ban.hpp" />
@@ -265,8 +294,8 @@
     <ClInclude Include="..\..\src\server\input_stream.hpp" />
     <ClInclude Include="..\..\src\server\metrics.hpp" />
     <ClInclude Include="..\..\src\server\player.hpp" />
+    <ClInclude Include="..\..\src\server\player_connection.hpp" />
     <ClInclude Include="..\..\src\server\player_network.hpp" />
-    <ClInclude Include="..\..\src\server\proxy.hpp" />
     <ClInclude Include="..\..\src\server\room.hpp" />
     <ClInclude Include="..\..\src\server\room_manager.hpp" />
     <ClInclude Include="..\..\src\server\sample_user_handler.hpp" />

diff --git a/projectfiles/VC12/wesnothd.vcxproj.filters b/projectfiles/VC12/wesnothd.vcxproj.filters
@@ -42,10 +42,10 @@
     <ClCompile Include="..\..\src\server\player.cpp">
       <Filter>Server</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\server\player_network.cpp">
+    <ClCompile Include="..\..\src\server\player_connection.cpp">
       <Filter>Server</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\server\proxy.cpp">
+    <ClCompile Include="..\..\src\server\player_network.cpp">
       <Filter>Server</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\server\room.cpp">
@@ -79,9 +79,6 @@
     <ClInclude Include="..\..\src\server\game.hpp">
       <Filter>Server</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\global.hpp">
-      <Filter>Server</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\server\input_stream.hpp">
       <Filter>Server</Filter>
     </ClInclude>
@@ -91,10 +88,10 @@
     <ClInclude Include="..\..\src\server\player.hpp">
       <Filter>Server</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\server\player_network.hpp">
+    <ClInclude Include="..\..\src\server\player_connection.hpp">
       <Filter>Server</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\server\proxy.hpp">
+    <ClInclude Include="..\..\src\server\player_network.hpp">
       <Filter>Server</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\server\room.hpp">