diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-05-29 22:48:28 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-05-30 11:48:28 +0200 |
| commit | 9b82aef002d0a38976af926252e78c535f8317ce (patch) | |
| tree | 63ca9e9cca8fae4192fe41d353afafd3b88d6f22 /travis/mingw32 | |
| parent | 29051766975d471c4eff9f7b3137752234cf1a4c (diff) | |
| download | PROJ-9b82aef002d0a38976af926252e78c535f8317ce.tar.gz PROJ-9b82aef002d0a38976af926252e78c535f8317ce.zip | |
CI environment: adapt for C++11 capable environments
Diffstat (limited to 'travis/mingw32')
| -rwxr-xr-x | travis/mingw32/before_install.sh | 8 | ||||
| -rwxr-xr-x | travis/mingw32/install.sh | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/travis/mingw32/before_install.sh b/travis/mingw32/before_install.sh index 5cadb761..d335bb3a 100755 --- a/travis/mingw32/before_install.sh +++ b/travis/mingw32/before_install.sh @@ -5,5 +5,9 @@ set -e ./travis/before_install.sh sudo apt-get update -qq -sudo apt-get install -qq wine -sudo apt-get install -qq mingw32 +sudo apt-get install binutils-mingw-w64-x86-64 +sudo apt-get install gcc-mingw-w64-x86-64 +sudo apt-get install g++-mingw-w64-x86-64 +sudo apt-get install g++-mingw-w64 +sudo apt-get install mingw-w64-tools +sudo apt-get install -y wine1.4-amd64 diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh index 49e395a5..c57b03d3 100755 --- a/travis/mingw32/install.sh +++ b/travis/mingw32/install.sh @@ -9,7 +9,7 @@ export CCACHE_CPP2=yes # autoconf build mkdir build_autoconf cd build_autoconf -CC="ccache i586-mingw32msvc-gcc" LD=i586-mingw32msvc-ld ../configure --host=i586-mingw32msvc --prefix=/tmp/proj_autoconf_install +CC="ccache x86_64-w64-mingw32-gcc" CXX="ccache x86_64-w64-mingw32-g++" LD=x86_64-w64-mingw32-ld ../configure --host=x86_64-w64-mingw32 --prefix=/tmp/proj_autoconf_install make -j3 make install make dist-all @@ -24,7 +24,7 @@ cd .. # autoconf build with grids mkdir build_autoconf_nad cd build_autoconf_nad -CC="ccache i586-mingw32msvc-gcc" LD=i586-mingw32msvc-ld ../configure --host=i586-mingw32msvc --prefix=/tmp/proj_autoconf_install_nad +CC="ccache x86_64-w64-mingw32-gcc" CXX="ccache x86_64-w64-mingw32-g++" LD=x86_64-w64-mingw32-ld ../configure --host=x86_64-w64-mingw32 --prefix=/tmp/proj_autoconf_install_nad make -j3 make install find /tmp/proj_autoconf_install_nad |