summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2005-02-19 09:37:12 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2005-02-19 09:37:12 +0000
commit360b1d4d6ca420ae98f87af166d739b34f05de22 (patch)
tree84d3587b334a297178ac38c355357a92415436bb
parent9df6377b13dfdda8ca6c97e2bd594c4279879388 (diff)
downloadmana-client-360b1d4d6ca420ae98f87af166d739b34f05de22.tar.gz
mana-client-360b1d4d6ca420ae98f87af166d739b34f05de22.tar.bz2
mana-client-360b1d4d6ca420ae98f87af166d739b34f05de22.tar.xz
mana-client-360b1d4d6ca420ae98f87af166d739b34f05de22.zip
Fixing PhysFS for Dev-Cpp -> WARNING: missing OpenGL code
-rw-r--r--The Mana World.dev6
-rw-r--r--docs/meetings/dev-20050218.txt2
-rw-r--r--src/resources/image.cpp7
3 files changed, 10 insertions, 5 deletions
diff --git a/The Mana World.dev b/The Mana World.dev
index be17f086..acdd6a88 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -10,9 +10,9 @@ Libs=
PrivateResource=The_Mana_World_private.rc
ResourceIncludes=
MakeIncludes=
-Compiler=-Dmain=SDL_main_@@_
-CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_
-Linker=-lguichan_@@_-lguichan_sdl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_-llibxml2_@@_
+Compiler=-Dmain=SDL_main_@@__@@_
+CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_-D__DEBUG_@@__@@_
+Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_-llibxml2_@@_-lopengl32_@@_-lphysfs_static_@@_
IsCpp=1
Icon=The Mana World.ico
ExeOutput=
diff --git a/docs/meetings/dev-20050218.txt b/docs/meetings/dev-20050218.txt
index 5f254ffa..22b87fe7 100644
--- a/docs/meetings/dev-20050218.txt
+++ b/docs/meetings/dev-20050218.txt
@@ -7,7 +7,7 @@ Timespan: 0.75 hours (21:00-21:45 GMT+1)
* We agreed to try a monthly release schedule. So with 0.0.9 released on 30th
- of Januari, 0.0.10 is scheduled by the end of this month, with the next
+ of January, 0.0.10 is scheduled by the end of this month, with the next
version the month after that, etc. This should remove any doubt about when
the next release is from both team members and players.
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 2798fa05..3f2e9560 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -211,8 +211,13 @@ Image* Image::load(const char* buffer, const unsigned int bufferSize)
// Now free the SDL_RWops data
//SDL_FreeRW(rw);
-
+
+#ifndef USE_OPENGL
return new Image(texture);
+#else
+ return new Image(0, 0, 0, 0, 0);
+ // Warning: need implementation to use with OpenGL
+#endif
}
void Image::unload()