summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-31 04:36:31 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-31 04:36:31 +0300
commitcfea5309386a749dcfc8f885910207a470278778 (patch)
treeab295c7b5280ad52e1fd843048928941f0f8e4d2 /.gitlab-ci.yml
parentade4963c8c43778cb0d9b2f181635adff5fd13ca (diff)
downloadspm-cfea5309386a749dcfc8f885910207a470278778.tar.gz
spm-cfea5309386a749dcfc8f885910207a470278778.tar.bz2
spm-cfea5309386a749dcfc8f885910207a470278778.tar.xz
spm-cfea5309386a749dcfc8f885910207a470278778.zip
Add other SDL libs into SDL builds.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml15
1 files changed, 13 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37a9424..076d3ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,16 +60,27 @@ test:commands2:
SDL_SDL-1.2:
stage: build
script:
- - ./.ci/install.sh mercurial bash gcc g++ make autoconf automake autopoint gettext \
+ - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext \
libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev
- ./.ci/buildlib.sh SDL SDL-1.2
+ - ./.ci/buildlib.sh SDL_gfx master
+ - ./.ci/buildlib.sh SDL_image SDL-1.2
+ - ./.ci/buildlib.sh SDL_mixer SDL-1.2
+ - ./.ci/buildlib.sh SDL_ttf SDL-1.2
- grep "1.2" /usr/local/spm/bin/SDL_SDL-1.2/lib/pkgconfig/sdl.pc
+ variables:
+ installname: SDL_SDL-1.2
<<: *job-artifacts
SDL_default:
stage: build
script:
- - ./.ci/install.sh mercurial bash gcc g++ make autoconf automake autopoint gettext \
+ - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext \
libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev
- ./.ci/buildlib.sh SDL default
+ - ./.ci/buildlib.sh SDL_image default
+ - ./.ci/buildlib.sh SDL_mixer default
+ - ./.ci/buildlib.sh SDL_ttf default
+ variables:
+ installname: SDL_default
<<: *job-artifacts