diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-03-11 05:41:51 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-03-11 05:41:51 +0300 |
commit | 81b97b30afa0c72e5ff17162c7d1fa88dd6187fb (patch) | |
tree | eaab72100ad146b6cc8d883172517835d73e7e26 | |
parent | b4b38bb98d95458442c745f30c0d697e2164fcd9 (diff) | |
download | plus-81b97b30afa0c72e5ff17162c7d1fa88dd6187fb.tar.gz plus-81b97b30afa0c72e5ff17162c7d1fa88dd6187fb.tar.bz2 plus-81b97b30afa0c72e5ff17162c7d1fa88dd6187fb.tar.xz plus-81b97b30afa0c72e5ff17162c7d1fa88dd6187fb.zip |
Add ci build with mingw-gcc5-shared-32 and SDL 1 libs.
-rw-r--r-- | .gitlab-ci.yml | 13 | ||||
-rwxr-xr-x | tools/ci/jobs/mxe_gcc5.sh | 20 | ||||
-rwxr-xr-x | tools/ci/scripts/winvars.sh | 20 |
3 files changed, 53 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8632cdfd..2585f19d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,6 +126,19 @@ gcc-4.4: tags: - docker +mxe_gcc5_shared_32: + stage: prebuild + script: + - ls /mxe + - ./tools/ci/jobs/mxe_gcc5.sh + <<: *job-shared + image: registry.gitlab.com/manaplus/mxe:gcc5_shared + variables: + PACKAGES: bash + CROSS: i686-w64-mingw32.shared + tags: + - docker + gcc-5_sdl2: stage: prebuild script: diff --git a/tools/ci/jobs/mxe_gcc5.sh b/tools/ci/jobs/mxe_gcc5.sh new file mode 100755 index 000000000..e9ae0d97b --- /dev/null +++ b/tools/ci/jobs/mxe_gcc5.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +export LOGFILE=mxe_gcc5.log + +source ./tools/ci/scripts/winvars.sh || exit 1 +source ./build/mingw5flags.sh || exit 1 + +$CC --version +$CXX --version + +echo env +env + +autoreconf -i || exit 1 + +./configure \ +--host=${CROSS} \ +--enable-werror || (cp config.log logs || exit 1) + +make -j2 V=0 diff --git a/tools/ci/scripts/winvars.sh b/tools/ci/scripts/winvars.sh new file mode 100755 index 000000000..0b3281777 --- /dev/null +++ b/tools/ci/scripts/winvars.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +export PATH=/mxe/usr/bin:/mxe/usr/x86_64-unknown-linux-gnu/bin:/mxe/usr/${CROSS}/bin:$PATH + +export AR=${CROSS}-ar +export AS=${CROSS}-as +export LD=${CROSS}-ld +export NM=${CROSS}-nm +export RC=${CROSS}-windres +export WINDRES=${CROSS}-windres +export ADD2LINE=${CROSS}-addr2line +export STRIP=${CROSS}-strip +export CC=${CROSS}-gcc +export CXX=${CROSS}-g++ +export CXXCPP=${CROSS}-cpp +export CPP=${CROSS}-cpp +export RANLIB=${CROSS}-ranlib + +export PKG_CONFIG="/mxe/usr/bin/${CROSS}-pkg-config" +export CXXFLAGS="-Wall -g1 -O5 -ffast-math -std=gnu++1z -funswitch-loops -funsafe-loop-optimizations -pipe" |