diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-11-26 02:55:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-11-26 02:55:10 +0300 |
| commit | 803c0016e39f72f621810f4b7e6d3f771b5ab1b9 (patch) | |
| tree | 853e6d9f74282282f65448d17ebef3b5bdc9630c | |
| parent | 1f3d4943749170cb67e82d01274472ac8a7970be (diff) | |
| download | spm-803c0016e39f72f621810f4b7e6d3f771b5ab1b9.tar.gz spm-803c0016e39f72f621810f4b7e6d3f771b5ab1b9.tar.bz2 spm-803c0016e39f72f621810f4b7e6d3f771b5ab1b9.tar.xz spm-803c0016e39f72f621810f4b7e6d3f771b5ab1b9.zip | |
Add workaround for SDL 1.2 compilation warning.
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c080964..1bc6b7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -139,6 +139,7 @@ manaplus_SDL-1.2: libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libegl1-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 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus @@ -162,6 +163,7 @@ manaplus_SDL-1.2_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 --without-manaplusgame --without-dyecmd - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests @@ -184,6 +186,7 @@ manaplus_SDL-1.2_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 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus @@ -208,6 +211,7 @@ manaplus_SDL-1.2_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 --without-manaplusgame --without-dyecmd - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests @@ -230,6 +234,7 @@ manaplus_SDL-1.2_asan_tests: libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libegl1-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 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests @@ -253,6 +258,7 @@ manaplus_SDL-1.2_asan: libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libegl1-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 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus @@ -276,6 +282,7 @@ manaplus_SDL-1.2_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 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests @@ -300,6 +307,7 @@ manaplus_SDL-1.2_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 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus |