Add workaround for SDL 2 compilation warning.

1 files changed, 22 insertions, 0 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 341dcbb..39b1787 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -311,6 +311,7 @@ manaplus_default:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -333,6 +334,7 @@ manaplus_201:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -355,6 +357,7 @@ manaplus_202:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -377,6 +380,7 @@ manaplus_203:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -399,6 +403,7 @@ manaplus_204:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -421,6 +426,7 @@ manaplus_205:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -443,6 +449,7 @@ manaplus_206:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -465,6 +472,7 @@ manaplus_207:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -488,6 +496,7 @@ manaplus_default_test:
                      valgrind 
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -510,6 +519,7 @@ manaplus_201_test:
                      valgrind 
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -532,6 +542,7 @@ manaplus_202_test:
                      valgrind 
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -554,6 +565,7 @@ manaplus_203_test:
                      valgrind 
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -576,6 +588,7 @@ manaplus_204_test:
                      valgrind 
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -598,6 +611,7 @@ manaplus_205_test:
                      valgrind 
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -620,6 +634,7 @@ manaplus_206_test:
                      valgrind 
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -642,6 +657,7 @@ manaplus_207_test:
                      valgrind 
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -664,6 +680,7 @@ manaplus_default_old:
                      libjpeg-dev libtiff-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -688,6 +705,7 @@ manaplus_default_old_test:
                      libjpeg-dev libtiff-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -709,6 +727,7 @@ manaplus_default_asan_tests:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -732,6 +751,7 @@ manaplus_default_asan:
                      libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_sanitize.sh --without-dyecmd --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -755,6 +775,7 @@ manaplus_default_old_asan_test:
                      libjpeg-dev libtiff-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
@@ -779,6 +800,7 @@ manaplus_default_old_asan:
                      libjpeg-dev libtiff-dev
                      git wget unzip gdb valgrind netcat-openbsd procps
   - ./.ci/clonesrc.sh
+  - sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL/SDL_opengl.h
   - cd cloned
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_sanitize.sh --without-dyecmd --with-sdl2
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus