summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-03 19:26:45 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-03 19:26:45 +0300
commit24d0d7e746bd6480c02b2c55852946545ee07724 (patch)
treeb611e08621159f87bd155d3fb6d074696bfdd16f
parent9b32c25679aa7b43e8e8c31d2e941941a83ce2b1 (diff)
downloadspm-24d0d7e746bd6480c02b2c55852946545ee07724.tar.gz
spm-24d0d7e746bd6480c02b2c55852946545ee07724.tar.bz2
spm-24d0d7e746bd6480c02b2c55852946545ee07724.tar.xz
spm-24d0d7e746bd6480c02b2c55852946545ee07724.zip
Add freetype lib into SDL builds.
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e67cb0b..d720c6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,12 +62,12 @@ SDL_SDL-1.2:
script:
- ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config
libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev
- libfreetype6-dev
- ./.ci/copyspm.sh
- ./.ci/buildlib.sh SDL SDL-1.2
- ${runenvtool} ./.ci/buildlib.sh zlib v1.2.9
- ${runenvtool} ./.ci/buildlib.sh SDL_gfx master
- ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
+ - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype 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
@@ -85,11 +85,11 @@ SDL_default:
script:
- ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config
libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev
- libfreetype6-dev
- ./.ci/copyspm.sh
- ./.ci/buildlib.sh SDL default
- ${runenvtool} ./.ci/buildlib.sh zlib v1.2.9
- ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
+ - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master
- ${runenvtool} ./.ci/buildlib.sh SDL_image default
- ${runenvtool} ./.ci/buildlib.sh SDL_mixer default
- ${runenvtool} ./.ci/buildlib.sh SDL_net default