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/render | |
| 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/render')
| -rw-r--r-- | src/render/opengl/mgltypes.h | 6 | ||||
| -rw-r--r-- | src/render/vertexes/openglgraphicsvertexes.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h index 9cc2644ca..874e4c9ff 100644 --- a/src/render/opengl/mgltypes.h +++ b/src/render/opengl/mgltypes.h @@ -32,10 +32,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 #ifdef __native_client__ #include <GL/Regal.h> #else // __native_client__ diff --git a/src/render/vertexes/openglgraphicsvertexes.h b/src/render/vertexes/openglgraphicsvertexes.h index 88661d3a8..3bc7f7f52 100644 --- a/src/render/vertexes/openglgraphicsvertexes.h +++ b/src/render/vertexes/openglgraphicsvertexes.h @@ -33,6 +33,7 @@ #endif // USE_SDL2 PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") +#define GL_GLEXT_LEGACY #include <SDL_opengl.h> PRAGMA48(GCC diagnostic pop) #endif // ANDROID |