summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-09-24 23:24:40 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-09-24 23:24:40 +0000
commit8f4b1c131b62a94170dda6a54c257a4730976fca (patch)
treed6f77e26f3f5c630269cd5f85cd0962677723642 /src/resources
parent4d99be2eac38f0bfad3b77f359e1f17aaceb63b4 (diff)
downloadmana-client-8f4b1c131b62a94170dda6a54c257a4730976fca.tar.gz
mana-client-8f4b1c131b62a94170dda6a54c257a4730976fca.tar.bz2
mana-client-8f4b1c131b62a94170dda6a54c257a4730976fca.tar.xz
mana-client-8f4b1c131b62a94170dda6a54c257a4730976fca.zip
Removed unused hairstyle frames and applied patch by Rogier Polak to solve the
problem with an OpenGL related redefinition.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/resources/image.h b/src/resources/image.h
index 1f67fcae..c769ecb6 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -26,6 +26,13 @@
#include <SDL.h>
#ifdef USE_OPENGL
+
+/* The definition of OpenGL extensions by SDL is giving problems with recent
+ * gl.h headers, since they also include these definitions. As we're not using
+ * extensions anyway it's safe to just disable the SDL version.
+ */
+#define NO_SDL_GLEXT
+
#include <SDL_opengl.h>
#endif