From ece19f6d44e2604f1d2fee9e0ece02030105e0d4 Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Sun, 13 Aug 2006 15:41:07 +0000
Subject: Fixed Guichan 0.5.0 compilation issues.

---
 ChangeLog          |  2 ++
 The Mana World.dev | 44 ++++++++++++++++++++++++++++++++++++++++++--
 src/gui/gui.cpp    |  5 +++--
 tmw.cbp            | 21 +++++++++++++++++++++
 4 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index acbee2c3..a76229e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	data/graphics/sprites/monster18.png,
 	data/graphics/sprites/monster18.xml,
 	data/graphics/sprites/npcs.png: Added new monster and npcs.
+	* src/gui.cpp, tmw.cbp, The Mana World.dev: Fixed Guichan 0.5.0
+	compilation issues.
 
 2006-08-13  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/The Mana World.dev b/The Mana World.dev
index 7f0ed5df..82c686d7 100644
--- a/The Mana World.dev	
+++ b/The Mana World.dev	
@@ -1,7 +1,7 @@
 [Project]
 FileName=The Mana World.dev
 Name=tmw
-UnitCount=230
+UnitCount=234
 Type=0
 Ver=1
 ObjFiles=
@@ -2330,7 +2330,7 @@ BuildCmd=
 [Unit228]
 FileName=src\tmw.rc
 CompileCpp=1
-Folder=tmw
+Folder=Resources
 Compile=1
 Link=0
 Priority=1000
@@ -2357,3 +2357,43 @@ OverrideBuildCmd=0
 BuildCmd=
 CompileCpp=1
 
+[Unit231]
+FileName=src\resources\openglsdlimageloader.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit232]
+FileName=src\resources\openglsdlimageloader.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit233]
+FileName=src\animatedsprite.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit234]
+FileName=src\animatedsprite.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index c980389f..a0548e9c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -27,12 +27,13 @@
 #include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
 
+// Should stay here because of Guichan being sensitive to headers order
+#include <guichan/sdl/sdlinput.hpp>
+
 #ifdef USE_OPENGL
 #include "../resources/openglsdlimageloader.h"
 #endif
 
-#include <guichan/sdl/sdlinput.hpp>
-
 #include "focushandler.h"
 #include "popupmenu.h"
 #include "window.h"
diff --git a/tmw.cbp b/tmw.cbp
index 327ccb0e..f607e229 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -10,6 +10,7 @@
 				<Option output="tmw.exe" />
 				<Option type="0" />
 				<Option compiler="gcc" />
+				<Option parameters="--skipupdate" />
 				<Option includeInTargetAll="1" />
 				<Option projectResourceIncludeDirsRelation="0" />
 				<Compiler>
@@ -41,6 +42,16 @@
 			<Add library="SDLmain" />
 			<Add library="SDL" />
 		</Linker>
+		<Unit filename="src\animatedsprite.cpp">
+			<Option compilerVar="CPP" />
+			<Option target="default" />
+		</Unit>
+		<Unit filename="src\animatedsprite.h">
+			<Option compilerVar="CPP" />
+			<Option compile="0" />
+			<Option link="0" />
+			<Option target="default" />
+		</Unit>
 		<Unit filename="src\animation.cpp">
 			<Option compilerVar="CPP" />
 			<Option target="default" />
@@ -1145,6 +1156,16 @@
 			<Option link="0" />
 			<Option target="default" />
 		</Unit>
+		<Unit filename="src\resources\openglsdlimageloader.cpp">
+			<Option compilerVar="CPP" />
+			<Option target="default" />
+		</Unit>
+		<Unit filename="src\resources\openglsdlimageloader.h">
+			<Option compilerVar="CPP" />
+			<Option compile="0" />
+			<Option link="0" />
+			<Option target="default" />
+		</Unit>
 		<Unit filename="src\resources\resource.cpp">
 			<Option compilerVar="CPP" />
 			<Option target="default" />
-- 
cgit v1.2.3-70-g09d2