diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-11-26 05:48:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-11-26 05:48:27 +0300 |
| commit | 1205920064e46d66b42fb152cd300157401a8d43 (patch) | |
| tree | 0350983c36d1eab08b5bd1cfcbbc0f7eeba69dda | |
| parent | 0309db30834d7568d755ada1d39e55e3faa2182f (diff) | |
| download | spm-1205920064e46d66b42fb152cd300157401a8d43.tar.gz spm-1205920064e46d66b42fb152cd300157401a8d43.tar.bz2 spm-1205920064e46d66b42fb152cd300157401a8d43.tar.xz spm-1205920064e46d66b42fb152cd300157401a8d43.zip | |
Fix SDL warning workaround for old SDL 2 builds.
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f5418b..548021b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -334,7 +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/SDL2/SDL_opengl.h + - sed -i 's|#define GL_GLEXT_VERSION 64|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 64\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL2/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 @@ -357,7 +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/SDL2/SDL_opengl.h + - sed -i 's|#define GL_GLEXT_VERSION 64|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 64\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL2/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 @@ -380,7 +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/SDL2/SDL_opengl.h + - sed -i 's|#define GL_GLEXT_VERSION 64|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 64\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL2/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 @@ -775,7 +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/SDL2/SDL_opengl.h + - sed -i 's|#define GL_GLEXT_VERSION 64|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 64\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL2/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 @@ -800,7 +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/SDL2/SDL_opengl.h + - sed -i 's|#define GL_GLEXT_VERSION 64|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 64\n#endif|' /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/include/SDL2/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 |