aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml12
-rwxr-xr-xtravis/linux_gcc7/before_install.sh4
2 files changed, 11 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 4f15edd4..4cf67068 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,16 +30,22 @@ matrix:
- docker
env:
- BUILD_NAME=linux_gcc7
- - DETAILS="linux, gcc7"
+ - DETAILS="linux, gcc7, i386"
+ - ARCH=i386
- CC=gcc-7
- CXX=g++-7
- - CXXFLAGS='-g -D_GLIBCXX_ASSERTIONS'
+ - CXXFLAGS='-g -O2 -m32 -D_GLIBCXX_ASSERTIONS'
+ - CFLAGS='-g -O2 -m32'
+ - TIFF_CFLAGS=-I/usr/include/i386-linux-gnu
+ - TIFF_LIBS="-L/usr/lib/i386-linux-gnu -ltiff"
+ - SQLITE3_CFLAGS=-I/usr/include/i386-linux-gnu
+ - SQLITE3_LIBS="-L/usr/lib/i386-linux-gnu -lsqlite3"
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- - g++-7
+ - g++-7-multilib
- make
- autoconf
- automake
diff --git a/travis/linux_gcc7/before_install.sh b/travis/linux_gcc7/before_install.sh
index 2ef2feee..424bc10e 100755
--- a/travis/linux_gcc7/before_install.sh
+++ b/travis/linux_gcc7/before_install.sh
@@ -8,8 +8,8 @@ set -e
sudo apt-get install -qq \
lcov \
doxygen graphviz \
- sqlite3 libsqlite3-dev \
- libtiff-dev libcurl4-openssl-dev
+ sqlite3 libsqlite3-dev:$ARCH \
+ libtiff-dev:$ARCH libcurl4-openssl-dev:$ARCH
#scripts/cppcheck.sh
#scripts/doxygen.sh