Merge pull request #458 from dydzio0614/VsUpdate

Update VS project files to match vcmi code changes

client/VCMI_client.vcxproj

@@ -156,6 +156,7 @@
       <AdditionalLibraryDirectories>$(VCMI_Out)</AdditionalLibraryDirectories>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <OptimizeReferences>true</OptimizeReferences>
+      <ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
       <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <CustomBuildStep>
@@ -190,8 +191,8 @@
     <ClCompile Include="CMT.cpp" />
     <ClCompile Include="CMusicHandler.cpp" />
     <ClCompile Include="CPlayerInterface.cpp" />
-    <ClCompile Include="CPreGame.cpp" />
     <ClCompile Include="CreatureCostBox.cpp" />
+    <ClCompile Include="CServerHandler.cpp" />
     <ClCompile Include="CVideoHandler.cpp" />
     <ClCompile Include="Graphics.cpp" />
     <ClCompile Include="gui\CAnimation.cpp" />
@@ -201,8 +202,21 @@
     <ClCompile Include="gui\Fonts.cpp" />
     <ClCompile Include="gui\Geometries.cpp" />
     <ClCompile Include="gui\SDL_Extensions.cpp" />
+    <ClCompile Include="lobby\CBonusSelection.cpp" />
+    <ClCompile Include="lobby\CLobbyScreen.cpp" />
+    <ClCompile Include="lobby\CSavingScreen.cpp" />
+    <ClCompile Include="lobby\CScenarioInfoScreen.cpp" />
+    <ClCompile Include="lobby\CSelectionBase.cpp" />
+    <ClCompile Include="lobby\OptionsTab.cpp" />
+    <ClCompile Include="lobby\RandomMapTab.cpp" />
+    <ClCompile Include="lobby\SelectionTab.cpp" />
+    <ClCompile Include="mainmenu\CCampaignScreen.cpp" />
+    <ClCompile Include="mainmenu\CMainMenu.cpp" />
+    <ClCompile Include="mainmenu\CPrologEpilogVideo.cpp" />
+    <ClCompile Include="mainmenu\CreditsScreen.cpp" />
     <ClCompile Include="mapHandler.cpp" />
     <ClCompile Include="NetPacksClient.cpp" />
+    <ClCompile Include="NetPacksLobbyClient.cpp" />
     <ClCompile Include="SDLRWwrapper.cpp" />
     <ClCompile Include="StdInc.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Create</PrecompiledHeader>
@@ -243,8 +257,8 @@
     <ClInclude Include="CMT.h" />
     <ClInclude Include="CMusicHandler.h" />
     <ClInclude Include="CPlayerInterface.h" />
-    <ClInclude Include="CPreGame.h" />
     <ClInclude Include="CreatureCostBox.h" />
+    <ClInclude Include="CServerHandler.h" />
     <ClInclude Include="CVideoHandler.h" />
     <ClInclude Include="Graphics.h" />
     <ClInclude Include="gui\CAnimation.h" />
@@ -256,6 +270,18 @@
     <ClInclude Include="gui\SDL_Compat.h" />
     <ClInclude Include="gui\SDL_Extensions.h" />
     <ClInclude Include="gui\SDL_Pixels.h" />
+    <ClInclude Include="lobby\CBonusSelection.h" />
+    <ClInclude Include="lobby\CLobbyScreen.h" />
+    <ClInclude Include="lobby\CSavingScreen.h" />
+    <ClInclude Include="lobby\CScenarioInfoScreen.h" />
+    <ClInclude Include="lobby\CSelectionBase.h" />
+    <ClInclude Include="lobby\OptionsTab.h" />
+    <ClInclude Include="lobby\RandomMapTab.h" />
+    <ClInclude Include="lobby\SelectionTab.h" />
+    <ClInclude Include="mainmenu\CCampaignScreen.h" />
+    <ClInclude Include="mainmenu\CMainMenu.h" />
+    <ClInclude Include="mainmenu\CPrologEpilogVideo.h" />
+    <ClInclude Include="mainmenu\CreditsScreen.h" />
     <ClInclude Include="mapHandler.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="SDLRWwrapper.h" />

client/VCMI_client.vcxproj.filters

@@ -8,7 +8,6 @@
     <ClCompile Include="CMT.cpp" />
     <ClCompile Include="CMusicHandler.cpp" />
     <ClCompile Include="CPlayerInterface.cpp" />
-    <ClCompile Include="CPreGame.cpp" />
     <ClCompile Include="CVideoHandler.cpp" />
     <ClCompile Include="Graphics.cpp" />
     <ClCompile Include="mapHandler.cpp" />
@@ -116,6 +115,20 @@
       <Filter>windows</Filter>
     </ClCompile>
     <ClCompile Include="CreatureCostBox.cpp" />
+    <ClCompile Include="CServerHandler.cpp" />
+    <ClCompile Include="NetPacksLobbyClient.cpp" />
+    <ClCompile Include="lobby\CBonusSelection.cpp" />
+    <ClCompile Include="lobby\CLobbyScreen.cpp" />
+    <ClCompile Include="lobby\CSavingScreen.cpp" />
+    <ClCompile Include="lobby\CScenarioInfoScreen.cpp" />
+    <ClCompile Include="lobby\CSelectionBase.cpp" />
+    <ClCompile Include="lobby\OptionsTab.cpp" />
+    <ClCompile Include="lobby\RandomMapTab.cpp" />
+    <ClCompile Include="lobby\SelectionTab.cpp" />
+    <ClCompile Include="mainmenu\CCampaignScreen.cpp" />
+    <ClCompile Include="mainmenu\CMainMenu.cpp" />
+    <ClCompile Include="mainmenu\CPrologEpilogVideo.cpp" />
+    <ClCompile Include="mainmenu\CreditsScreen.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="VCMI_client.rc" />
@@ -145,7 +158,6 @@
     <ClInclude Include="CMT.h" />
     <ClInclude Include="CMusicHandler.h" />
     <ClInclude Include="CPlayerInterface.h" />
-    <ClInclude Include="CPreGame.h" />
     <ClInclude Include="CVideoHandler.h" />
     <ClInclude Include="Graphics.h" />
     <ClInclude Include="mapHandler.h" />
@@ -259,5 +271,18 @@
       <Filter>windows</Filter>
     </ClInclude>
     <ClInclude Include="CreatureCostBox.h" />
+    <ClInclude Include="CServerHandler.h" />
+    <ClInclude Include="lobby\CBonusSelection.h" />
+    <ClInclude Include="lobby\CLobbyScreen.h" />
+    <ClInclude Include="lobby\CSavingScreen.h" />
+    <ClInclude Include="lobby\CScenarioInfoScreen.h" />
+    <ClInclude Include="lobby\CSelectionBase.h" />
+    <ClInclude Include="lobby\OptionsTab.h" />
+    <ClInclude Include="lobby\RandomMapTab.h" />
+    <ClInclude Include="lobby\SelectionTab.h" />
+    <ClInclude Include="mainmenu\CCampaignScreen.h" />
+    <ClInclude Include="mainmenu\CMainMenu.h" />
+    <ClInclude Include="mainmenu\CPrologEpilogVideo.h" />
+    <ClInclude Include="mainmenu\CreditsScreen.h" />
   </ItemGroup>
 </Project>

lib/VCMI_lib.vcxproj

@@ -151,6 +151,7 @@
       </LinkTimeCodeGeneration>
       <AdditionalLibraryDirectories>..\..\libs</AdditionalLibraryDirectories>
       <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
+      <ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">
@@ -209,6 +210,7 @@
     <ClCompile Include="filesystem\FileInfo.cpp" />
     <ClCompile Include="filesystem\FileStream.cpp" />
     <ClCompile Include="filesystem\MinizipExtensions.cpp" />
+    <ClCompile Include="registerTypes\TypesLobbyPacks.cpp" />
     <ClCompile Include="serializer\BinaryDeserializer.cpp" />
     <ClCompile Include="serializer\BinarySerializer.cpp" />
     <ClCompile Include="serializer\CLoadIntegrityValidator.cpp" />
@@ -290,7 +292,6 @@
     <ClCompile Include="registerTypes\TypesMapObjects1.cpp" />
     <ClCompile Include="registerTypes\TypesMapObjects2.cpp" />
     <ClCompile Include="registerTypes\TypesMapObjects3.cpp" />
-    <ClCompile Include="registerTypes\TypesPregamePacks.cpp" />
     <ClCompile Include="registerTypes\TypesServerPacks.cpp" />
     <ClCompile Include="rmg\CMapGenerator.cpp" />
     <ClCompile Include="logging\CLogger.cpp" />
@@ -307,6 +308,7 @@
     <ClCompile Include="rmg\CRmgTemplateZone.cpp" />
     <ClCompile Include="rmg\CZoneGraphGenerator.cpp" />
     <ClCompile Include="rmg\CZonePlacer.cpp" />
+    <ClCompile Include="StartInfo.cpp" />
     <ClCompile Include="StdInc.cpp">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">VCMI_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -318,6 +320,7 @@
     </ClCompile>
     <ClCompile Include="VCMIDirs.cpp" />
     <ClCompile Include="VCMI_Lib.cpp" />
+    <ClCompile Include="vstd\StringUtils.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Global.h" />
@@ -417,6 +420,7 @@
     <ClInclude Include="mapping\MapFormatH3M.h" />
     <ClInclude Include="mapping\MapFormatJson.h" />
     <ClInclude Include="NetPacksBase.h" />
+    <ClInclude Include="NetPacksLobby.h" />
     <ClInclude Include="registerTypes\RegisterTypes.h" />
     <ClInclude Include="rmg\CMapGenerator.h" />
     <ClInclude Include="logging\CLogger.h" />

lib/VCMI_lib.vcxproj.filters

@@ -35,6 +35,9 @@
     <Filter Include="spells\effects">
       <UniqueIdentifier>{a3de4952-3c98-4c1a-bc4b-bd3eeaa82ba7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="vstd">
+      <UniqueIdentifier>{91722359-2231-4596-8e73-dbdcd14bd4f3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CArtHandler.cpp" />
@@ -143,9 +146,6 @@
     <ClCompile Include="registerTypes\TypesClientPacks2.cpp">
       <Filter>registerTypes</Filter>
     </ClCompile>
-    <ClCompile Include="registerTypes\TypesPregamePacks.cpp">
-      <Filter>registerTypes</Filter>
-    </ClCompile>
     <ClCompile Include="registerTypes\TypesServerPacks.cpp">
       <Filter>registerTypes</Filter>
     </ClCompile>
@@ -389,6 +389,13 @@
     <ClCompile Include="spells\ProxyCaster.cpp">
       <Filter>spells</Filter>
     </ClCompile>
+    <ClCompile Include="StartInfo.cpp" />
+    <ClCompile Include="registerTypes\TypesLobbyPacks.cpp">
+      <Filter>registerTypes</Filter>
+    </ClCompile>
+    <ClCompile Include="vstd\StringUtils.cpp">
+      <Filter>vstd</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CCreatureSet.h">
@@ -901,5 +908,8 @@
     <ClInclude Include="spells\ProxyCaster.h">
       <Filter>spells</Filter>
     </ClInclude>
+    <ClInclude Include="NetPacksLobby.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

server/VCMI_server.vcxproj

@@ -151,6 +151,7 @@
     <ClCompile Include="CGameHandler.cpp" />
     <ClCompile Include="CQuery.cpp" />
     <ClCompile Include="CVCMIServer.cpp" />
+    <ClCompile Include="NetPacksLobbyServer.cpp" />
     <ClCompile Include="NetPacksServer.cpp" />
     <ClCompile Include="StdInc.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>