diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-02-18 15:44:18 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-02-18 15:44:18 +0300 |
commit | 563248edefb8887d93ceaf6bd5a52f54825b78c1 (patch) | |
tree | af5d06b537ee9915be755b022b33db71dd0cc901 /.gitlab-ci.yml | |
parent | f0c7e9a220302b67b95bd8ab5f71b2ffac15c0c1 (diff) | |
download | spm-563248edefb8887d93ceaf6bd5a52f54825b78c1.tar.gz spm-563248edefb8887d93ceaf6bd5a52f54825b78c1.tar.bz2 spm-563248edefb8887d93ceaf6bd5a52f54825b78c1.tar.xz spm-563248edefb8887d93ceaf6bd5a52f54825b78c1.zip |
Use zlib from master branch in SDL builds with new versions.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b230c7..f87a735 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ SDL_SDL-1.2: libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev - ./.ci/copyspm.sh - ./.ci/buildlib.sh SDL SDL-1.2 - - ${runenvtool} ./.ci/buildlib.sh zlib v1.2.8 + - ${runenvtool} ./.ci/buildlib.sh zlib master - ${runenvtool} ./.ci/buildlib.sh SDL_gfx master - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh physfs stable-2.0 - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master @@ -91,7 +91,7 @@ SDL_default: - ./.ci/copyspm.sh - ./.ci/buildlib.sh SDL2 default - cp /usr/local/spm/env/runSDL2_default.sh /usr/local/spm/env/runSDL_default.sh - - ${runenvtool} ./.ci/buildlib.sh zlib v1.2.8 + - ${runenvtool} ./.ci/buildlib.sh zlib master - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh physfs stable-2.0 - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master |