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/fboinfo.h | |
| parent | 27004e91dc0f1a38886008d419b85e5fdbab369c (diff) | |
| download | plus-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/fboinfo.h')
| -rw-r--r-- | src/resources/fboinfo.h | 6 |
1 files changed, 6 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__) |