summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-11-26 03:08:57 +0300
committerAndrei Karas <akaras@inbox.ru>2018-11-26 03:08:57 +0300
commit186e1c3ebd9f27f6f8bd7c6daa5b45fc35b34b99 (patch)
tree0ce059c81f8f63253ad922aff734d7785a7b2c1c
parenteae858b6fae0c252b2c521610950e1fce18cb241 (diff)
downloadspm-tinyxml2.tar.gz
spm-tinyxml2.tar.bz2
spm-tinyxml2.tar.xz
spm-tinyxml2.zip
Add workaround for SDL 1.2 compilation warning.tinyxml2
-rw-r--r--.gitlab-ci.yml5
1 files changed, 5 insertions, 0 deletions
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