Updating VC project files for e4f03fe.

wesnoth · May 4, 2017 · 265a0e9 · 265a0e9
1 parent 616f3b5
commit 265a0e9
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 30 deletions.
diff --git a/projectfiles/VC12/wesnoth.vcxproj b/projectfiles/VC12/wesnoth.vcxproj
@@ -890,13 +890,6 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Editor\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Editor\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\editor\editor_preferences.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Editor\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Editor\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Editor\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Editor\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Editor\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\src\editor\map\context_manager.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Editor\Map\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Editor\Map\</ObjectFileName>
@@ -1266,7 +1259,6 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Game_Initialization\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\src\game_launcher.cpp" />
-    <ClCompile Include="..\..\src\game_preferences.cpp" />
     <ClCompile Include="..\..\src\game_state.cpp" />
     <ClCompile Include="..\..\src\generators\cave_map_generator.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)generators\</ObjectFileName>
@@ -2471,7 +2463,6 @@
     <ClCompile Include="..\..\src\joystick.cpp" />
     <ClCompile Include="..\..\src\key.cpp" />
     <ClCompile Include="..\..\src\language.cpp" />
-    <ClCompile Include="..\..\src\lobby_preferences.cpp" />
     <ClCompile Include="..\..\src\lua_jailbreak_exception.cpp" />
     <ClCompile Include="..\..\src\map\label.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Map\</ObjectFileName>
@@ -2536,8 +2527,41 @@
     <ClCompile Include="..\..\src\playturn.cpp" />
     <ClCompile Include="..\..\src\playturn_network_adapter.cpp" />
     <ClCompile Include="..\..\src\play_controller.cpp" />
-    <ClCompile Include="..\..\src\preferences.cpp" />
-    <ClCompile Include="..\..\src\preferences_display.cpp" />
+    <ClCompile Include="..\..\src\preferences\display.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\src\preferences\editor.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\src\preferences\game.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\src\preferences\general.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\src\preferences\lobby.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Preferences\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Preferences\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\src\quit_confirmation.cpp" />
     <ClCompile Include="..\..\src\random.cpp" />
     <ClCompile Include="..\..\src\random_deterministic.cpp" />
@@ -3523,7 +3547,6 @@
     <ClInclude Include="..\..\src\editor\editor_common.hpp" />
     <ClInclude Include="..\..\src\editor\editor_display.hpp" />
     <ClInclude Include="..\..\src\editor\editor_main.hpp" />
-    <ClInclude Include="..\..\src\editor\editor_preferences.hpp" />
     <ClInclude Include="..\..\src\editor\map\context_manager.hpp" />
     <ClInclude Include="..\..\src\editor\map\editor_map.hpp" />
     <ClInclude Include="..\..\src\editor\map\map_context.hpp" />
@@ -3605,7 +3628,6 @@
     <ClInclude Include="..\..\src\game_initialization\playcampaign.hpp" />
     <ClInclude Include="..\..\src\game_initialization\singleplayer.hpp" />
     <ClInclude Include="..\..\src\game_launcher.hpp" />
-    <ClInclude Include="..\..\src\game_preferences.hpp" />
     <ClInclude Include="..\..\src\game_state.hpp" />
     <ClInclude Include="..\..\src\generators\cave_map_generator.hpp" />
     <ClInclude Include="..\..\src\generators\default_map_generator.hpp" />
@@ -3814,7 +3836,6 @@
     <ClInclude Include="..\..\src\joystick.hpp" />
     <ClInclude Include="..\..\src\key.hpp" />
     <ClInclude Include="..\..\src\language.hpp" />
-    <ClInclude Include="..\..\src\lobby_preferences.hpp" />
     <ClInclude Include="..\..\src\lua_jailbreak_exception.hpp" />
     <ClInclude Include="..\..\src\map\exception.hpp" />
     <ClInclude Include="..\..\src\map\label.hpp" />
@@ -3844,8 +3865,11 @@
     <ClInclude Include="..\..\src\playturn.hpp" />
     <ClInclude Include="..\..\src\playturn_network_adapter.hpp" />
     <ClInclude Include="..\..\src\play_controller.hpp" />
-    <ClInclude Include="..\..\src\preferences.hpp" />
-    <ClInclude Include="..\..\src\preferences_display.hpp" />
+    <ClInclude Include="..\..\src\preferences\display.hpp" />
+    <ClInclude Include="..\..\src\preferences\editor.hpp" />
+    <ClInclude Include="..\..\src\preferences\game.hpp" />
+    <ClInclude Include="..\..\src\preferences\general.hpp" />
+    <ClInclude Include="..\..\src\preferences\lobby.hpp" />
     <ClInclude Include="..\..\src\quit_confirmation.hpp" />
     <ClInclude Include="..\..\src\random.hpp" />
     <ClInclude Include="..\..\src\random_deterministic.hpp" />

diff --git a/projectfiles/VC12/wesnoth.vcxproj.filters b/projectfiles/VC12/wesnoth.vcxproj.filters
@@ -164,6 +164,9 @@
     <Filter Include="Font\Pango">
       <UniqueIdentifier>{c4a05de3-89fe-417e-a054-751a5d9d171b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Preferences">
+      <UniqueIdentifier>{b0433154-cf07-4ead-b777-917bbb4d553c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\packaging\windows\wesnoth.rc">
@@ -314,9 +317,6 @@
     <ClCompile Include="..\..\src\editor\editor_main.cpp">
       <Filter>Editor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\editor\editor_preferences.cpp">
-      <Filter>Editor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\editor\action\action.cpp">
       <Filter>Editor\Action</Filter>
     </ClCompile>
@@ -1432,7 +1432,6 @@
     <ClCompile Include="..\..\src\game_display.cpp" />
     <ClCompile Include="..\..\src\game_end_exceptions.cpp" />
     <ClCompile Include="..\..\src\game_launcher.cpp" />
-    <ClCompile Include="..\..\src\game_preferences.cpp" />
     <ClCompile Include="..\..\src\game_state.cpp" />
     <ClCompile Include="..\..\src\generic_event.cpp" />
     <ClCompile Include="..\..\src\halo.cpp" />
@@ -1442,7 +1441,6 @@
     <ClCompile Include="..\..\src\joystick.cpp" />
     <ClCompile Include="..\..\src\key.cpp" />
     <ClCompile Include="..\..\src\language.cpp" />
-    <ClCompile Include="..\..\src\lobby_preferences.cpp" />
     <ClCompile Include="..\..\src\lua_jailbreak_exception.cpp" />
     <ClCompile Include="..\..\src\md5.cpp" />
     <ClCompile Include="..\..\src\menu_events.cpp" />
@@ -1463,8 +1461,6 @@
     <ClCompile Include="..\..\src\playsingle_controller.cpp" />
     <ClCompile Include="..\..\src\playturn.cpp" />
     <ClCompile Include="..\..\src\playturn_network_adapter.cpp" />
-    <ClCompile Include="..\..\src\preferences.cpp" />
-    <ClCompile Include="..\..\src\preferences_display.cpp" />
     <ClCompile Include="..\..\src\quit_confirmation.cpp" />
     <ClCompile Include="..\..\src\random.cpp" />
     <ClCompile Include="..\..\src\random_deterministic.cpp" />
@@ -1529,6 +1525,21 @@
     <ClCompile Include="..\..\src\font\text_surface.cpp">
       <Filter>Font</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\preferences\display.cpp">
+      <Filter>Preferences</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\preferences\editor.cpp">
+      <Filter>Preferences</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\preferences\game.cpp">
+      <Filter>Preferences</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\preferences\general.cpp">
+      <Filter>Preferences</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\preferences\lobby.cpp">
+      <Filter>Preferences</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\addon\client.hpp">
@@ -1669,9 +1680,6 @@
     <ClInclude Include="..\..\src\editor\editor_main.hpp">
       <Filter>Editor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\editor\editor_preferences.hpp">
-      <Filter>Editor</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\editor\action\action.hpp">
       <Filter>Editor\Action</Filter>
     </ClInclude>
@@ -2839,7 +2847,6 @@
     <ClInclude Include="..\..\src\game_end_exceptions.hpp" />
     <ClInclude Include="..\..\src\game_errors.hpp" />
     <ClInclude Include="..\..\src\game_launcher.hpp" />
-    <ClInclude Include="..\..\src\game_preferences.hpp" />
     <ClInclude Include="..\..\src\game_state.hpp" />
     <ClInclude Include="..\..\src\generic_event.hpp" />
     <ClInclude Include="..\..\src\global.hpp" />
@@ -2850,7 +2857,6 @@
     <ClInclude Include="..\..\src\joystick.hpp" />
     <ClInclude Include="..\..\src\key.hpp" />
     <ClInclude Include="..\..\src\language.hpp" />
-    <ClInclude Include="..\..\src\lobby_preferences.hpp" />
     <ClInclude Include="..\..\src\lua_jailbreak_exception.hpp" />
     <ClInclude Include="..\..\src\map_command_handler.hpp" />
     <ClInclude Include="..\..\src\md5.hpp" />
@@ -2874,8 +2880,6 @@
     <ClInclude Include="..\..\src\playsingle_controller.hpp" />
     <ClInclude Include="..\..\src\playturn.hpp" />
     <ClInclude Include="..\..\src\playturn_network_adapter.hpp" />
-    <ClInclude Include="..\..\src\preferences.hpp" />
-    <ClInclude Include="..\..\src\preferences_display.hpp" />
     <ClInclude Include="..\..\src\quit_confirmation.hpp" />
     <ClInclude Include="..\..\src\random.hpp" />
     <ClInclude Include="..\..\src\random_deterministic.hpp" />
@@ -2972,6 +2976,21 @@
     <ClInclude Include="..\..\src\font\pango\stream_ops.hpp">
       <Filter>Font\Pango</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\preferences\display.hpp">
+      <Filter>Preferences</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\preferences\editor.hpp">
+      <Filter>Preferences</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\preferences\game.hpp">
+      <Filter>Preferences</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\preferences\general.hpp">
+      <Filter>Preferences</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\preferences\lobby.hpp">
+      <Filter>Preferences</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\tests\test_sdl_utils.hpp">