summaryrefslogtreecommitdiff
path: root/src/render/modernopenglgraphics.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2020-11-27 05:36:42 +0300
committerjak1 <mike.wollmann@gmail.com>2021-03-11 20:57:13 +0000
commit7124d95d082d77b7e00447a4ecad094e575e8fa9 (patch)
treec609a913d6ac659e08b1b6d81446e4af984773d2 /src/render/modernopenglgraphics.h
parent54b88d05bbbe616c05814d57cc4f86de649ce98c (diff)
downloadplus-7124d95d082d77b7e00447a4ecad094e575e8fa9.tar.gz
plus-7124d95d082d77b7e00447a4ecad094e575e8fa9.tar.bz2
plus-7124d95d082d77b7e00447a4ecad094e575e8fa9.tar.xz
plus-7124d95d082d77b7e00447a4ecad094e575e8fa9.zip
Silence warning -Wredundant-decls in SDL 1.2 code
Also switch in debug build script to gcc 10.
Diffstat (limited to 'src/render/modernopenglgraphics.h')
-rw-r--r--src/render/modernopenglgraphics.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h
index 4362ea20d..b9a40212c 100644
--- a/src/render/modernopenglgraphics.h
+++ b/src/render/modernopenglgraphics.h
@@ -42,12 +42,19 @@
#endif // USE_SDL2
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
+// ignore -Wredundant-decls for SDL 1.2
+PRAGMA45(GCC diagnostic push)
+PRAGMA45(GCC diagnostic ignored "-Wredundant-decls")
#include <SDL_opengl.h>
+PRAGMA45(GCC diagnostic pop)
PRAGMA48(GCC diagnostic pop)
#if defined(__APPLE__)
#include <OpenGL/glext.h>
#elif !defined(__native_client__)
+PRAGMA45(GCC diagnostic push)
+PRAGMA45(GCC diagnostic ignored "-Wredundant-decls")
#include <GL/glext.h>
+PRAGMA45(GCC diagnostic pop)
#endif // defined(__APPLE__)
#endif // ANDROID