From a113a8d289ec77aaf428f19dd8193b7f77820fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= <mwu-tow@gazeta.pl>
Date: Sun, 8 Feb 2009 16:36:53 +0000
Subject: [PATCH] * patch update from Dikamilo

---
 AI/GeniusAI/CGeniusAI.cpp |  2 +-
 AI/GeniusAI/CGeniusAI.h   | 28 ++++++++++++++--------------
 AI/GeniusAI/genius.cbp    | 17 ++++++++++-------
 client/VCMI_client.cbp    | 17 ++++++++++-------
 lib/VCMI_lib.cbp          | 12 ++++++------
 server/VCMI_server.cbp    | 17 ++++++++++-------
 vcmi.workspace            |  4 ++--
 7 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/AI/GeniusAI/CGeniusAI.cpp b/AI/GeniusAI/CGeniusAI.cpp
index 300f29920..d6e3516e8 100644
--- a/AI/GeniusAI/CGeniusAI.cpp
+++ b/AI/GeniusAI/CGeniusAI.cpp
@@ -14,7 +14,7 @@ using namespace boost::lambda;
 using namespace std;
 using namespace GeniusAI;
 
-#if defined (_MSC_VER) && (_MSC_VER >= 1020) && (__MINGW32__)
+#if defined (_MSC_VER) && (_MSC_VER >= 1020) || (__MINGW32__)
 #include <windows.h>
 #endif
 
diff --git a/AI/GeniusAI/CGeniusAI.h b/AI/GeniusAI/CGeniusAI.h
index 13dbaf919..a77a4aea5 100644
--- a/AI/GeniusAI/CGeniusAI.h
+++ b/AI/GeniusAI/CGeniusAI.h
@@ -81,16 +81,16 @@ private:
 	};
 	enum EActionType
 	{
-		action_cancel = 0,				// Cancel BattleAction   
-		action_cast_spell = 1,			// Hero cast a spell   
-		action_walk = 2,				// Walk   
-		action_defend = 3,				// Defend   
-		action_retreat = 4,				// Retreat from the battle   
-		action_surrender = 5,			// Surrender   
-		action_walk_and_attack = 6,		// Walk and Attack   
-		action_shoot = 7,				// Shoot    
-		action_wait = 8,				// Wait   
-		action_catapult = 9,			// Catapult 
+		action_cancel = 0,				// Cancel BattleAction
+		action_cast_spell = 1,			// Hero cast a spell
+		action_walk = 2,				// Walk
+		action_defend = 3,				// Defend
+		action_retreat = 4,				// Retreat from the battle
+		action_surrender = 5,			// Surrender
+		action_walk_and_attack = 6,		// Walk and Attack
+		action_shoot = 7,				// Shoot
+		action_wait = 8,				// Wait
+		action_catapult = 9,			// Catapult
 		action_monster_casts_spell = 10 // Monster casts a spell (i.e. Faerie Dragons)
 	};
 	struct SCreatureCasualties
@@ -118,10 +118,10 @@ private:
 	bool m_bIsAttacker;
 	ICallback *m_cb;
 	CCreatureSet *m_army1;
-	CCreatureSet *m_army2; 
-	int3 m_tile; 
+	CCreatureSet *m_army2;
+	int3 m_tile;
 	CGHeroInstance *m_hero1;
-	CGHeroInstance *m_hero2; 
+	CGHeroInstance *m_hero2;
 	bool m_side;
 
 	// statistics
@@ -174,7 +174,7 @@ private:
 	/**
 	 * Only for debug purpose.
 	 */
-	void CBattleLogic::PrintBattleAction(const BattleAction &action);
+	void PrintBattleAction(const BattleAction &action);
 };
 
 class CGeniusAI : public CGlobalAI
diff --git a/AI/GeniusAI/genius.cbp b/AI/GeniusAI/genius.cbp
index bbe10c0b7..792be6722 100644
--- a/AI/GeniusAI/genius.cbp
+++ b/AI/GeniusAI/genius.cbp
@@ -9,9 +9,9 @@
 		<Build>
 			<Target title="Debug Win32">
 				<Option platforms="Windows;" />
-				<Option output="..\..\..\..\..\Install\Heroes3\AI\GeniusAI" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\..\..\..\Install\Heroes3\AI" />
-				<Option object_output="Debug Win32" />
+				<Option output="bin\Debug\GeniusAI" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="bin\Debug\" />
+				<Option object_output="obj\Debug\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -25,12 +25,15 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DGENIUS_EXPORTS" />
 				</Compiler>
+				<Linker>
+					<Add library="..\..\lib\bin\Debug\libVCMI_lib.a" />
+				</Linker>
 			</Target>
 			<Target title="Release Win32">
 				<Option platforms="Windows;" />
-				<Option output="..\..\..\..\..\Install\Heroes3\AI\GeniusAI" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\..\..\..\Install\Heroes3\AI" />
-				<Option object_output="Release Win32" />
+				<Option output="bin\Release\GeniusAI" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="bin\Release\" />
+				<Option object_output="obj\Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -51,6 +54,7 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add library="..\..\lib\bin\Release\libVCMI_lib.a" />
 				</Linker>
 			</Target>
 		</Build>
@@ -59,7 +63,6 @@
 			<Add directory="$(#boost.include)" />
 		</Compiler>
 		<Linker>
-			<Add library="..\..\..\..\..\Install\Heroes3\libVCMI_lib.a" />
 			<Add directory="$(#boost.lib)" />
 		</Linker>
 		<Unit filename="CGeniusAI.cpp" />
diff --git a/client/VCMI_client.cbp b/client/VCMI_client.cbp
index 10625f8ec..97d7f9bc1 100644
--- a/client/VCMI_client.cbp
+++ b/client/VCMI_client.cbp
@@ -9,9 +9,9 @@
 		<Build>
 			<Target title="Debug Win32">
 				<Option platforms="Windows;" />
-				<Option output="..\..\..\..\Install\Heroes3\VCMI_client" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\..\..\Install\Heroes3" />
-				<Option object_output="Debug Win32" />
+				<Option output="bin\Debug\VCMI_client" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="bin\Debug\" />
+				<Option object_output="obj\Debug\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
@@ -19,12 +19,15 @@
 					<Add option="-g" />
 					<Add option="-D_DEBUG" />
 				</Compiler>
+				<Linker>
+					<Add library="..\..\lib\bin\Debug\libVCMI_lib.a" />
+				</Linker>
 			</Target>
 			<Target title="Release Win32">
 				<Option platforms="Windows;" />
-				<Option output="..\..\..\..\Install\Heroes3\VCMI_client" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\..\..\Install\Heroes3" />
-				<Option object_output="Release Win32" />
+				<Option output="bin\Release\VCMI_client" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="bin\Release\" />
+				<Option object_output="obj\Release\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
@@ -38,6 +41,7 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add library="..\..\lib\bin\Release\libVCMI_lib.a" />
 				</Linker>
 			</Target>
 		</Build>
@@ -57,7 +61,6 @@
 			<Add option="-llibboost_thread-mgw43-mt-1_37" />
 			<Add option="-llibboost_system-mgw43-mt-1_37" />
 			<Add option="-llibboost_filesystem-mgw43-mt-1_37" />
-			<Add library="..\..\..\..\Install\Heroes3\libVCMI_lib.a" />
 			<Add directory="$(#sdl.lib)" />
 			<Add directory="$(#boost.lib)" />
 			<Add directory="$(#zlib.lib)" />
diff --git a/lib/VCMI_lib.cbp b/lib/VCMI_lib.cbp
index 1a30a12e1..f59a312f5 100644
--- a/lib/VCMI_lib.cbp
+++ b/lib/VCMI_lib.cbp
@@ -9,9 +9,9 @@
 		<Build>
 			<Target title="Debug Win32">
 				<Option platforms="Windows;" />
-				<Option output="..\..\..\..\Install\Heroes3\VCMI_lib" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\..\..\Install\Heroes3" />
-				<Option object_output="Debug Win32" />
+				<Option output="bin\Debug\VCMI_lib" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="bin\Debug\" />
+				<Option object_output="obj\Debug\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -23,9 +23,9 @@
 			</Target>
 			<Target title="Release Win32">
 				<Option platforms="Windows;" />
-				<Option output="..\..\..\..\Install\Heroes3\VCMI_lib" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\..\..\Install\Heroes3" />
-				<Option object_output="Release Win32" />
+				<Option output="bin\Release\VCMI_lib" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="bin\Release\" />
+				<Option object_output="obj\Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
diff --git a/server/VCMI_server.cbp b/server/VCMI_server.cbp
index 519091af0..402648ec9 100644
--- a/server/VCMI_server.cbp
+++ b/server/VCMI_server.cbp
@@ -9,21 +9,24 @@
 		<Build>
 			<Target title="Debug Win32">
 				<Option platforms="Windows;" />
-				<Option output="..\..\..\..\Install\Heroes3\VCMI_server" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\..\..\Install\Heroes3" />
-				<Option object_output="Debug Win32" />
+				<Option output="bin\Debug\VCMI_server" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="bin\Debug\" />
+				<Option object_output="obj\Debug\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
+				<Linker>
+					<Add library="..\..\lib\bin\Debug\libVCMI_lib.a" />
+				</Linker>
 			</Target>
 			<Target title="Release Win32">
 				<Option platforms="Windows;" />
-				<Option output="..\..\..\..\Install\Heroes3\VCMI_server" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="..\..\..\..\Install\Heroes3" />
-				<Option object_output="Release Win32" />
+				<Option output="bin\Release\VCMI_server" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="bin\Release\" />
+				<Option object_output="obj\Release\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
@@ -37,6 +40,7 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
+					<Add library="..\..\lib\bin\Release\libVCMI_lib.a" />
 				</Linker>
 			</Target>
 		</Build>
@@ -51,7 +55,6 @@
 			<Add option="-llibboost_filesystem-mgw43-mt-1_37" />
 			<Add option="-lwsock32" />
 			<Add option="-lws2_32" />
-			<Add library="..\..\..\..\Install\Heroes3\libVCMI_lib.a" />
 			<Add directory="$(#zlib.lib)" />
 			<Add directory="$(#boost.lib)" />
 		</Linker>
diff --git a/vcmi.workspace b/vcmi.workspace
index 89d03d88f..7f1ec3eca 100644
--- a/vcmi.workspace
+++ b/vcmi.workspace
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="VCMI">
-		<Project filename="client\VCMI_client.cbp" />
+		<Project filename="client\VCMI_client.cbp" active="1" />
 		<Project filename="server\VCMI_server.cbp" />
-		<Project filename="lib\VCMI_lib.cbp" active="1" />
+		<Project filename="lib\VCMI_lib.cbp" />
 		<Project filename="AI\GeniusAI\genius.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>