diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-11-26 08:03:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-11-26 08:03:40 +0300 |
| commit | 520e16556606e7e8602b03bf98594cdac79e4afd (patch) | |
| tree | e557767f1c9f11c5758bfb55fcbb50aa0eb4d512 | |
| parent | 1205920064e46d66b42fb152cd300157401a8d43 (diff) | |
| download | spm-520e16556606e7e8602b03bf98594cdac79e4afd.tar.gz spm-520e16556606e7e8602b03bf98594cdac79e4afd.tar.bz2 spm-520e16556606e7e8602b03bf98594cdac79e4afd.tar.xz spm-520e16556606e7e8602b03bf98594cdac79e4afd.zip | |
Fix SDL warning workaround for old SDL 2 builds again.
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 548021b..742ec32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -680,7 +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/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 @@ -705,7 +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/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_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 |