summaryrefslogtreecommitdiff
path: root/src/resources/openglimagehelper.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-05-31 21:42:15 +0300
committerAndrei Karas <akaras@inbox.ru>2019-05-31 21:46:40 +0300
commitbdbab22de6556e904343d5d4bb21c20595f57b0b (patch)
treec3bca4cd18b12c8911e999389fd36979369de9c1 /src/resources/openglimagehelper.h
parent27004e91dc0f1a38886008d419b85e5fdbab369c (diff)
downloadplus-bdbab22de6556e904343d5d4bb21c20595f57b0b.tar.gz
plus-bdbab22de6556e904343d5d4bb21c20595f57b0b.tar.bz2
plus-bdbab22de6556e904343d5d4bb21c20595f57b0b.tar.xz
plus-bdbab22de6556e904343d5d4bb21c20595f57b0b.zip
Fix compilation warnings with new mesa and SDL 1.2
Add workaround to fix SDL redefine bug.
Diffstat (limited to 'src/resources/openglimagehelper.h')
-rw-r--r--src/resources/openglimagehelper.h6
1 files changed, 6 insertions, 0 deletions
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;