summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-08 16:54:23 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-08 17:07:14 +0300
commita378c2459754e27a0b1101fe0635a7cc35e099af (patch)
tree61087b06cca7944138bb68f8dbe3fe8d3256ddeb
parented25dc245064be417b1305699ebd377030b59180 (diff)
downloadplus-a378c2459754e27a0b1101fe0635a7cc35e099af.tar.gz
plus-a378c2459754e27a0b1101fe0635a7cc35e099af.tar.bz2
plus-a378c2459754e27a0b1101fe0635a7cc35e099af.tar.xz
plus-a378c2459754e27a0b1101fe0635a7cc35e099af.zip
Add sdl 2 builds with gcc 4.8 and 4.9
-rw-r--r--.gitlab-ci.yml25
-rwxr-xr-xtools/ci/jobs/gcc44.sh2
-rwxr-xr-xtools/ci/jobs/gcc45.sh2
-rwxr-xr-xtools/ci/jobs/gcc46.sh2
-rwxr-xr-xtools/ci/jobs/gcc47.sh2
-rwxr-xr-xtools/ci/jobs/gcc48.sh2
6 files changed, 30 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c92113acc..39ac2b2cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1346,6 +1346,31 @@ gcc-6_no_asserts:
libxml2-dev libcurl4-gnutls-dev libpng-dev
libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+gcc-4.8_sdl2:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc48.sh
+ image: debian:stable
+ <<: *job-shared
+ variables:
+ PACKAGES: gcc-4.8 g++-4.8
+ make autoconf automake autopoint gettext libphysfs-dev
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
+
+gcc-4.9_sdl2:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc49.sh
+ image: debian:stable
+ <<: *job-shared
+ variables:
+ PACKAGES: gcc-4.9 g++-4.9
+ make autoconf automake autopoint gettext libphysfs-dev
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
+
+
# different tools
gcc-5_h_eathena_tmwa:
diff --git a/tools/ci/jobs/gcc44.sh b/tools/ci/jobs/gcc44.sh
index a6a32e849..4096c66bf 100755
--- a/tools/ci/jobs/gcc44.sh
+++ b/tools/ci/jobs/gcc44.sh
@@ -7,7 +7,7 @@ export LOGFILE=gcc44.log
source ./tools/ci/scripts/init.sh
do_init
-run_configure --enable-werror
+run_configure --enable-werror $*
run_make
source ./tools/ci/scripts/exit.sh
diff --git a/tools/ci/jobs/gcc45.sh b/tools/ci/jobs/gcc45.sh
index b42da3d5e..d23c07636 100755
--- a/tools/ci/jobs/gcc45.sh
+++ b/tools/ci/jobs/gcc45.sh
@@ -7,7 +7,7 @@ export LOGFILE=gcc45.log
source ./tools/ci/scripts/init.sh
do_init
-run_configure --enable-werror
+run_configure --enable-werror $*
run_make
source ./tools/ci/scripts/exit.sh
diff --git a/tools/ci/jobs/gcc46.sh b/tools/ci/jobs/gcc46.sh
index 6219200a2..595215d34 100755
--- a/tools/ci/jobs/gcc46.sh
+++ b/tools/ci/jobs/gcc46.sh
@@ -7,7 +7,7 @@ export LOGFILE=gcc46.log
source ./tools/ci/scripts/init.sh
do_init
-run_configure --enable-werror
+run_configure --enable-werror $*
run_make
source ./tools/ci/scripts/exit.sh
diff --git a/tools/ci/jobs/gcc47.sh b/tools/ci/jobs/gcc47.sh
index 3b87c4aa6..9e62ac228 100755
--- a/tools/ci/jobs/gcc47.sh
+++ b/tools/ci/jobs/gcc47.sh
@@ -7,7 +7,7 @@ export LOGFILE=gcc47.log
source ./tools/ci/scripts/init.sh
do_init
-run_configure --enable-werror
+run_configure --enable-werror $*
run_make
source ./tools/ci/scripts/exit.sh
diff --git a/tools/ci/jobs/gcc48.sh b/tools/ci/jobs/gcc48.sh
index 41063c86c..c85351ed4 100755
--- a/tools/ci/jobs/gcc48.sh
+++ b/tools/ci/jobs/gcc48.sh
@@ -7,7 +7,7 @@ export LOGFILE=gcc47.log
source ./tools/ci/scripts/init.sh
do_init
-run_configure --enable-werror
+run_configure --enable-werror $*
run_make
source ./tools/ci/scripts/exit.sh