summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-26 20:05:52 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-26 20:05:52 +0300
commit2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20 (patch)
treeaa18fb3b84d3a09c90890b6cd189529783472e77 /src/resources
parentabad3f0ef49e3891ceef6844adeb139778de6738 (diff)
downloadmv-2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20.tar.gz
mv-2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20.tar.bz2
mv-2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20.tar.xz
mv-2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20.zip
fix compilation warnings with sdl2.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image.h2
-rw-r--r--src/resources/openglimagehelper.h2
-rw-r--r--src/resources/subimage.h2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/resources/image.h b/src/resources/image.h
index a40f62dee..7cdb1b5b3 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -35,7 +35,9 @@
#ifdef ANDROID
#include <GLES/gl.h>
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
#endif
#endif
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index e19c5e735..254edde9d 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -43,7 +43,9 @@
#include <GLES/gl.h>
#define GL_RGBA8 GL_RGBA8_OES
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
#endif
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index 5322f9a71..d61d47eb4 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -33,7 +33,9 @@
#ifdef ANDROID
#include <GLES/gl.h>
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
#endif