From e8f94fe7ca5e7e7838eaa84f1792b4b42b4bada3 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 29 Sep 2006 23:59:08 +0000
Subject: Merged trunk changes from revision 2618 to 2716 into the 0.1.0
 branch.

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

(limited to 'src/resources/image.h')

diff --git a/src/resources/image.h b/src/resources/image.h
index 78751394..a1ab7f48 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -28,6 +28,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