summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-11-26 03:06:35 +0300
committerAndrei Karas <akaras@inbox.ru>2018-11-26 03:06:35 +0300
commit44031d0944470e179e2c1a2990965749dfcb7fd3 (patch)
tree8c99ebd66dcc6c0f42216cf426a8432e0924d835
parent75d810737b797b2c06dfe19c94cc508d67a7d16c (diff)
downloadspm-44031d0944470e179e2c1a2990965749dfcb7fd3.tar.gz
spm-44031d0944470e179e2c1a2990965749dfcb7fd3.tar.bz2
spm-44031d0944470e179e2c1a2990965749dfcb7fd3.tar.xz
spm-44031d0944470e179e2c1a2990965749dfcb7fd3.zip
Add workaround for SDL 1.2 compilation warning.
-rw-r--r--.gitlab-ci.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7de0e76..b4c8a7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,6 +126,7 @@ manaplus_v2.9.4:
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
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -147,6 +148,7 @@ manaplus_v2.9.4:
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
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -168,6 +170,7 @@ manaplus_v2.9.4:
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
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
@@ -188,6 +191,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
- /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus