From 8f4b1c131b62a94170dda6a54c257a4730976fca Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 24 Sep 2006 23:24:40 +0000
Subject: Removed unused hairstyle frames and applied patch by Rogier Polak to
 solve the problem with an OpenGL related redefinition.

---
 src/resources/image.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/resources')

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
 
-- 
cgit v1.2.3-70-g09d2