diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-08-13 15:41:07 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-08-13 15:41:07 +0000 |
| commit | ece19f6d44e2604f1d2fee9e0ece02030105e0d4 (patch) | |
| tree | fe9289e04ff287424f89fb84bf6581509b349844 | |
| parent | 63e05e9c45e1098f38e92868a0ba939cbad11048 (diff) | |
| download | mana-ece19f6d44e2604f1d2fee9e0ece02030105e0d4.tar.gz mana-ece19f6d44e2604f1d2fee9e0ece02030105e0d4.tar.bz2 mana-ece19f6d44e2604f1d2fee9e0ece02030105e0d4.tar.xz mana-ece19f6d44e2604f1d2fee9e0ece02030105e0d4.zip | |
Fixed Guichan 0.5.0 compilation issues.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | The Mana World.dev | 44 | ||||
| -rw-r--r-- | src/gui/gui.cpp | 5 | ||||
| -rw-r--r-- | tmw.cbp | 21 |
4 files changed, 68 insertions, 4 deletions
@@ -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" @@ -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" /> |