summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/fboinfo.h6
-rw-r--r--src/resources/image/image.h6
-rw-r--r--src/resources/openglimagehelper.h6
-rw-r--r--src/resources/safeopenglimagehelper.h6
4 files changed, 24 insertions, 0 deletions
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index e18e9b938..5f47630c1 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -29,10 +29,16 @@
#include <GLES/gl.h>
#include <GLES/glext.h>
#else // ANDROID
+#ifdef HAVE_GLEXT
+#define NO_SDL_GLEXT
+#endif // HAVE_GLEXT
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
PRAGMA48(GCC diagnostic pop)
+#ifdef HAVE_GLEXT
+#include <GL/glext.h>
+#endif // HAVE_GLEXT
#if defined(__APPLE__)
#include <OpenGL/glext.h>
#elif !defined(__native_client__)
diff --git a/src/resources/image/image.h b/src/resources/image/image.h
index 31836483e..b15ff7d33 100644
--- a/src/resources/image/image.h
+++ b/src/resources/image/image.h
@@ -37,10 +37,16 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#ifdef HAVE_GLEXT
+#define NO_SDL_GLEXT
+#endif // HAVE_GLEXT
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
PRAGMA48(GCC diagnostic pop)
+#ifdef HAVE_GLEXT
+#include <GL/glext.h>
+#endif // HAVE_GLEXT
#endif // ANDROID
#endif // USE_OPENGL
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index b2fd153e6..173f53bb7 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -41,10 +41,16 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#ifdef HAVE_GLEXT
+#define NO_SDL_GLEXT
+#endif // HAVE_GLEXT
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
PRAGMA48(GCC diagnostic pop)
+#ifdef HAVE_GLEXT
+#include <GL/glext.h>
+#endif // HAVE_GLEXT
#endif // ANDROID
class Dye;
diff --git a/src/resources/safeopenglimagehelper.h b/src/resources/safeopenglimagehelper.h
index c212288f8..4a2e9346b 100644
--- a/src/resources/safeopenglimagehelper.h
+++ b/src/resources/safeopenglimagehelper.h
@@ -41,10 +41,16 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#ifdef HAVE_GLEXT
+#define NO_SDL_GLEXT
+#endif // HAVE_GLEXT
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
PRAGMA48(GCC diagnostic pop)
+#ifdef HAVE_GLEXT
+#include <GL/glext.h>
+#endif // HAVE_GLEXT
#endif // ANDROID
class Dye;