[c::b] Update project, fixed build

client/CGameInfo.cpp

@@ -9,8 +9,8 @@
  */
 #include "StdInc.h"
 #include "CGameInfo.h"
-#include "CSkillHandler.h"
-#include "CGeneralTextHandler.h"
+#include "../lib/CSkillHandler.h"
+#include "../lib/CGeneralTextHandler.h"
 
 #include "../lib/VCMI_Lib.h"
 

lib/VCMI_lib.cbp

@@ -125,30 +125,6 @@
 		<Unit filename="../Version.h" />
 		<Unit filename="../include/vstd/CLoggerBase.h" />
 		<Unit filename="AI_Base.h" />
-		<Unit filename="battle/BattleAction.cpp" />
-		<Unit filename="battle/BattleAction.h" />
-		<Unit filename="battle/BattleHex.cpp" />
-		<Unit filename="battle/BattleHex.h" />
-		<Unit filename="battle/BattleInfo.cpp" />
-		<Unit filename="battle/BattleInfo.h" />
-		<Unit filename="battle/AccessibilityInfo.cpp" />
-		<Unit filename="battle/AccessibilityInfo.h" />
-		<Unit filename="battle/BattleAttackInfo.cpp" />
-		<Unit filename="battle/BattleAttackInfo.h" />
-		<Unit filename="battle/CBattleInfoCallback.cpp" />
-		<Unit filename="battle/CBattleInfoCallback.h" />
-		<Unit filename="battle/CBattleInfoEssentials.cpp" />
-		<Unit filename="battle/CBattleInfoEssentials.h" />
-		<Unit filename="battle/CCallbackBase.cpp" />
-		<Unit filename="battle/CCallbackBase.h" />
-		<Unit filename="battle/CPlayerBattleCallback.cpp" />
-		<Unit filename="battle/CPlayerBattleCallback.h" />
-		<Unit filename="battle/ReachabilityInfo.cpp" />
-		<Unit filename="battle/ReachabilityInfo.h" />
-		<Unit filename="battle/SideInBattle.cpp" />
-		<Unit filename="battle/SideInBattle.h" />
-		<Unit filename="battle/SiegeInfo.cpp" />
-		<Unit filename="battle/SiegeInfo.h" />
 		<Unit filename="CArtHandler.cpp" />
 		<Unit filename="CArtHandler.h" />
 		<Unit filename="CBonusTypeHandler.cpp" />
@@ -177,14 +153,14 @@
 		<Unit filename="CMakeLists.txt" />
 		<Unit filename="CModHandler.cpp" />
 		<Unit filename="CModHandler.h" />
-		<Unit filename="battle/CObstacleInstance.cpp" />
-		<Unit filename="battle/CObstacleInstance.h" />
 		<Unit filename="CPathfinder.cpp" />
 		<Unit filename="CPathfinder.h" />
 		<Unit filename="CPlayerState.h" />
 		<Unit filename="CRandomGenerator.cpp" />
 		<Unit filename="CRandomGenerator.h" />
 		<Unit filename="CScriptingModule.h" />
+		<Unit filename="CSkillHandler.cpp" />
+		<Unit filename="CSkillHandler.h" />
 		<Unit filename="CSoundBase.h" />
 		<Unit filename="CStack.cpp" />
 		<Unit filename="CStack.h" />
@@ -230,6 +206,32 @@
 		<Unit filename="VCMIDirs.h" />
 		<Unit filename="VCMI_Lib.cpp" />
 		<Unit filename="VCMI_Lib.h" />
+		<Unit filename="battle/AccessibilityInfo.cpp" />
+		<Unit filename="battle/AccessibilityInfo.h" />
+		<Unit filename="battle/BattleAction.cpp" />
+		<Unit filename="battle/BattleAction.h" />
+		<Unit filename="battle/BattleAttackInfo.cpp" />
+		<Unit filename="battle/BattleAttackInfo.h" />
+		<Unit filename="battle/BattleHex.cpp" />
+		<Unit filename="battle/BattleHex.h" />
+		<Unit filename="battle/BattleInfo.cpp" />
+		<Unit filename="battle/BattleInfo.h" />
+		<Unit filename="battle/CBattleInfoCallback.cpp" />
+		<Unit filename="battle/CBattleInfoCallback.h" />
+		<Unit filename="battle/CBattleInfoEssentials.cpp" />
+		<Unit filename="battle/CBattleInfoEssentials.h" />
+		<Unit filename="battle/CCallbackBase.cpp" />
+		<Unit filename="battle/CCallbackBase.h" />
+		<Unit filename="battle/CObstacleInstance.cpp" />
+		<Unit filename="battle/CObstacleInstance.h" />
+		<Unit filename="battle/CPlayerBattleCallback.cpp" />
+		<Unit filename="battle/CPlayerBattleCallback.h" />
+		<Unit filename="battle/ReachabilityInfo.cpp" />
+		<Unit filename="battle/ReachabilityInfo.h" />
+		<Unit filename="battle/SideInBattle.cpp" />
+		<Unit filename="battle/SideInBattle.h" />
+		<Unit filename="battle/SiegeInfo.cpp" />
+		<Unit filename="battle/SiegeInfo.h" />
 		<Unit filename="filesystem/AdapterLoaders.cpp" />
 		<Unit filename="filesystem/AdapterLoaders.h" />
 		<Unit filename="filesystem/CArchiveLoader.cpp" />