Merge pull request #319 from dydzio0614/vsfix

Improve VS build filters file + precompiled header path fix

lib/VCMI_lib.vcxproj.filters

@@ -29,9 +29,11 @@
     <Filter Include="serializer">
       <UniqueIdentifier>{2f582170-d8a6-42f3-8da3-8255bac28f5a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="battle">
+      <UniqueIdentifier>{d18aad99-ef40-484a-b317-8f7a36d975fc}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="battle\BattleAction.cpp" />
     <ClCompile Include="CArtHandler.cpp" />
     <ClCompile Include="CBuildingHandler.cpp" />
     <ClCompile Include="CCreatureHandler.cpp" />
@@ -49,20 +51,11 @@
     <ClCompile Include="ResourceSet.cpp" />
     <ClCompile Include="CGameInterface.cpp" />
     <ClCompile Include="JsonNode.cpp" />
-    <ClCompile Include="battle\BattleHex.cpp" />
     <ClCompile Include="CConsoleHandler.cpp" />
     <ClCompile Include="CThreadHelper.cpp" />
     <ClCompile Include="StdInc.cpp" />
-    <ClCompile Include="battle\CObstacleInstance.cpp" />
     <ClCompile Include="CModHandler.cpp" />
     <ClCompile Include="CConfigHandler.cpp" />
-    <ClCompile Include="battle\AccessibilityInfo.cpp" />
-    <ClCompile Include="battle\BattleAttackInfo.cpp" />
-    <ClCompile Include="battle\CBattleInfoCallback.cpp" />
-    <ClCompile Include="battle\CBattleInfoEssentials.cpp" />
-    <ClCompile Include="battle\CCallbackBase.cpp" />
-    <ClCompile Include="battle\CPlayerBattleCallback.cpp" />
-    <ClCompile Include="battle\ReachabilityInfo.cpp" />
     <ClCompile Include="Mapping\CCampaignHandler.cpp" />
     <ClCompile Include="GameConstants.cpp" />
     <ClCompile Include="VCMIDirs.cpp" />
@@ -267,9 +260,45 @@
     <ClCompile Include="serializer\CTypeList.cpp" />
     <ClCompile Include="serializer\Connection.cpp" />
     <ClCompile Include="CStack.cpp" />
-    <ClCompile Include="battle\SideInBattle.cpp" />
-    <ClCompile Include="battle\SiegeInfo.cpp" />
-    <ClCompile Include="battle\BattleInfo.cpp" />
+    <ClCompile Include="battle\AccessibilityInfo.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\BattleAction.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\BattleAttackInfo.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\BattleHex.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\BattleInfo.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\CBattleInfoCallback.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\CBattleInfoEssentials.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\CCallbackBase.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\CObstacleInstance.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\CPlayerBattleCallback.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\ReachabilityInfo.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\SideInBattle.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
+    <ClCompile Include="battle\SiegeInfo.cpp">
+      <Filter>battle</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CCreatureSet.h">
@@ -323,12 +352,6 @@
     <ClInclude Include="CTownHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="battle\BattleAction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="battle\CObstacleInstance.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="IGameEventsReceiver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -350,9 +373,6 @@
     <ClInclude Include="AI_Base.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="battle\BattleHex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="CConsoleHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -386,27 +406,6 @@
     <ClInclude Include="CConfigHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AccessibilityInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BattleAttackInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CBattleInfoCallback.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CBattleInfoEssentials.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CCallbackBase.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CPlayerBattleCallback.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ReachabilityInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Mapping\CCampaignHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -680,17 +679,47 @@
     <ClInclude Include="serializer\Connection.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="battle\BattleInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="CStack.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="battle\AccessibilityInfo.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\BattleAction.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\BattleAttackInfo.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\BattleHex.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\BattleInfo.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\CBattleInfoCallback.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\CBattleInfoEssentials.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\CCallbackBase.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\CObstacleInstance.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\CPlayerBattleCallback.h">
+      <Filter>battle</Filter>
+    </ClInclude>
+    <ClInclude Include="battle\ReachabilityInfo.h">
+      <Filter>battle</Filter>
+    </ClInclude>
     <ClInclude Include="battle\SideInBattle.h">
-      <Filter>Header Files</Filter>
+      <Filter>battle</Filter>
     </ClInclude>
     <ClInclude Include="battle\SiegeInfo.h">
-      <Filter>Header Files</Filter>
+      <Filter>battle</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

lib/battle/AccessibilityInfo.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "AccessibilityInfo.h"
 #include "../CStack.h"
 

lib/battle/BattleAction.cpp

@@ -8,7 +8,7 @@
  *
  */
 
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "BattleAction.h"
 #include "../CStack.h"
 

lib/battle/BattleAttackInfo.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "BattleAttackInfo.h"
 #include "../CStack.h"
 

lib/battle/BattleHex.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "BattleHex.h"
 
 BattleHex::BattleHex() : hex(INVALID) {}

lib/battle/BattleInfo.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "BattleInfo.h"
 #include "../CStack.h"
 #include "../CHeroHandler.h"

lib/battle/CBattleInfoCallback.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "CBattleInfoCallback.h"
 #include "../CStack.h"
 #include "BattleInfo.h"

lib/battle/CBattleInfoEssentials.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "CBattleInfoEssentials.h"
 #include "../CStack.h"
 #include "BattleInfo.h"

lib/battle/CCallbackBase.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "CCallbackBase.h"
 #include "BattleInfo.h"
 #include "../CGameState.h"

lib/battle/CObstacleInstance.cpp

@@ -1,4 +1,4 @@
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "CObstacleInstance.h"
 #include "../CHeroHandler.h"
 #include "../CTownHandler.h"

lib/battle/CPlayerBattleCallback.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "CPlayerBattleCallback.h"
 #include "../CStack.h"
 #include "../CGameState.h"

lib/battle/ReachabilityInfo.cpp

@@ -8,7 +8,7 @@
  *
  */
 
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "ReachabilityInfo.h"
 #include "../CStack.h"
 

lib/battle/SideInBattle.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "SideInBattle.h"
 #include "../mapObjects/CArmedInstance.h"
 

lib/battle/SiegeInfo.cpp

@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-#include "../StdInc.h"
+#include "StdInc.h"
 #include "SiegeInfo.h"