summaryrefslogtreecommitdiff
path: root/src
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
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')
-rw-r--r--src/graphicsmanager.h2
-rw-r--r--src/graphicsvertexes.h2
-rw-r--r--src/mgl.h2
-rw-r--r--src/mobileopenglgraphics.h2
-rw-r--r--src/normalopenglgraphics.h2
-rw-r--r--src/nullopenglgraphics.h2
-rw-r--r--src/resources/image.h2
-rw-r--r--src/resources/openglimagehelper.h2
-rw-r--r--src/resources/subimage.h2
-rw-r--r--src/safeopenglgraphics.h2
10 files changed, 20 insertions, 0 deletions
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index cca1e5898..ac91d7bd8 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -28,7 +28,9 @@
#ifdef ANDROID
#include <GLES/gl.h>
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
// hack to hide warnings
#undef GL_GLEXT_VERSION
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index aa9d58ff6..6324341e3 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -30,7 +30,9 @@
#ifdef ANDROID
#include <GLES/gl.h>
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
#endif
diff --git a/src/mgl.h b/src/mgl.h
index d6165dc0d..335ee48f1 100644
--- a/src/mgl.h
+++ b/src/mgl.h
@@ -29,7 +29,9 @@
#include <GLES/glext.h>
#define APIENTRY GL_APIENTRY
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
#include <GL/glext.h>
#endif
diff --git a/src/mobileopenglgraphics.h b/src/mobileopenglgraphics.h
index c41a15a04..307ff5f2f 100644
--- a/src/mobileopenglgraphics.h
+++ b/src/mobileopenglgraphics.h
@@ -36,7 +36,9 @@
#include <GLES/glext.h>
#include <GLES2/gl2.h>
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
#include <GL/glext.h>
#endif
diff --git a/src/normalopenglgraphics.h b/src/normalopenglgraphics.h
index 3b6dc0c19..6c6a62a77 100644
--- a/src/normalopenglgraphics.h
+++ b/src/normalopenglgraphics.h
@@ -36,7 +36,9 @@
#include <GLES/glext.h>
#include <GLES2/gl2.h>
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
#include <GL/glext.h>
#endif
diff --git a/src/nullopenglgraphics.h b/src/nullopenglgraphics.h
index 73c08b81e..cecd0e167 100644
--- a/src/nullopenglgraphics.h
+++ b/src/nullopenglgraphics.h
@@ -36,7 +36,9 @@
#include <GLES/glext.h>
#include <GLES2/gl2.h>
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
#include <GL/glext.h>
#endif
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
diff --git a/src/safeopenglgraphics.h b/src/safeopenglgraphics.h
index 469c4cda0..7462d2259 100644
--- a/src/safeopenglgraphics.h
+++ b/src/safeopenglgraphics.h
@@ -34,7 +34,9 @@
#include <GLES/gl.h>
#include <GLES/glext.h>
#else
+#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
+#endif
#include <SDL_opengl.h>
#include <GL/glext.h>
#endif