diff options
| author | Andrei Karas <akaras@inbox.ru> | 2019-05-31 21:42:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2019-05-31 21:46:40 +0300 |
| commit | bdbab22de6556e904343d5d4bb21c20595f57b0b (patch) | |
| tree | c3bca4cd18b12c8911e999389fd36979369de9c1 /src/resources | |
| parent | 27004e91dc0f1a38886008d419b85e5fdbab369c (diff) | |
| download | manaverse-bdbab22de6556e904343d5d4bb21c20595f57b0b.tar.gz manaverse-bdbab22de6556e904343d5d4bb21c20595f57b0b.tar.bz2 manaverse-bdbab22de6556e904343d5d4bb21c20595f57b0b.tar.xz manaverse-bdbab22de6556e904343d5d4bb21c20595f57b0b.zip | |
Fix compilation warnings with new mesa and SDL 1.2
Add workaround to fix SDL redefine bug.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/fboinfo.h | 6 | ||||
| -rw-r--r-- | src/resources/image/image.h | 6 | ||||
| -rw-r--r-- | src/resources/openglimagehelper.h | 6 | ||||
| -rw-r--r-- | src/resources/safeopenglimagehelper.h | 6 |
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; |