From 520e16556606e7e8602b03bf98594cdac79e4afd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 26 Nov 2018 08:03:40 +0300 Subject: Fix SDL warning workaround for old SDL 2 builds again. --- .gitlab-ci.yml | 4 ++-- 1 file 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 -- cgit v1.2.3-60-g2f50