From 60cc47868611511dcfe64867aac3b7eb183c164f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 6 Feb 2017 11:32:26 +0300 Subject: Add libxml2, physfs, curl into SDL builds. --- .gitlab-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f159ee..a7e0272 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,14 +60,17 @@ test:commands2: SDL_SDL-1.2: stage: build script: - - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config + - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake 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 SDL_gfx master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh physfs stable-2.0 - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master - ${runenvtool} ./.ci/buildlib.sh SDL_image SDL-1.2 - ${runenvtool} ./.ci/buildlib.sh SDL_mixer SDL-1.2 - ${runenvtool} ./.ci/buildlib.sh SDL_net SDL-1.2 @@ -83,14 +86,17 @@ SDL_SDL-1.2: SDL_default: stage: build script: - - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config + - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev - ./.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} ${runenvtoolz} ./.ci/buildlib.sh physfs stable-2.0 - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master - ${runenvtool} ./.ci/buildlib.sh SDL2_image default - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer default - ${runenvtool} ./.ci/buildlib.sh SDL2_net default -- cgit v1.2.3-60-g2f50