From 186e1c3ebd9f27f6f8bd7c6daa5b45fc35b34b99 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 26 Nov 2018 03:08:57 +0300 Subject: Add workaround for SDL 1.2 compilation warning. --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef94924..c0b53a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,6 +137,7 @@ manaplus_master: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-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/include/SDL/SDL_opengl.h - cd cloned - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh --enable-libxml=tinyxml2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus @@ -157,6 +158,7 @@ manaplus_5.0.1: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-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/include/SDL/SDL_opengl.h - cd cloned - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh --enable-libxml=tinyxml2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus @@ -177,6 +179,7 @@ manaplus_4.0.1: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-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/include/SDL/SDL_opengl.h - cd cloned - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh --enable-libxml=tinyxml2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus @@ -197,6 +200,7 @@ manaplus_3.0.0: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-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/include/SDL/SDL_opengl.h - cd cloned - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh --enable-libxml=tinyxml2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus @@ -217,6 +221,7 @@ manaplus_2.2.0: libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-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/include/SDL/SDL_opengl.h - cd cloned - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh --enable-libxml=tinyxml2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus -- cgit v1.2.3-60-g2f50