From bdbab22de6556e904343d5d4bb21c20595f57b0b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 31 May 2019 21:42:15 +0300 Subject: Fix compilation warnings with new mesa and SDL 1.2 Add workaround to fix SDL redefine bug. --- src/graphicsmanager.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/graphicsmanager.h') diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h index eef60b50c..9033f7f63 100644 --- a/src/graphicsmanager.h +++ b/src/graphicsmanager.h @@ -30,10 +30,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 PRAGMA48(GCC diagnostic pop) +#ifdef HAVE_GLEXT +#include +#endif // HAVE_GLEXT // hack to hide warnings #undef GL_GLEXT_VERSION #undef GL_GLEXT_PROTOTYPES -- cgit v1.2.3-70-g09d2