diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-26 20:05:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-26 20:05:52 +0300 |
| commit | 2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20 (patch) | |
| tree | aa18fb3b84d3a09c90890b6cd189529783472e77 /src/resources | |
| parent | abad3f0ef49e3891ceef6844adeb139778de6738 (diff) | |
| download | manaplus-2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20.tar.gz manaplus-2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20.tar.bz2 manaplus-2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20.tar.xz manaplus-2c6df55a9430612f3d0e6f0c4bedaa7752e4bd20.zip | |
fix compilation warnings with sdl2.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/image.h | 2 | ||||
| -rw-r--r-- | src/resources/openglimagehelper.h | 2 | ||||
| -rw-r--r-- | src/resources/subimage.h | 2 |
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 |