diff --git a/.travis.yml b/.travis.yml index 70a69d5b3..43323f3c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,11 @@ matrix: env: TEST=apidoc - compiler: gcc env: TEST=win64 MONOLITHIC=yes + # this does not work on 14.04 due to a missing @4 decoration for + # TryAcquireSRWLockExclusive in MinGW 3.1.0 - compiler: gcc env: TEST=win32 MONOLITHIC=yes + dist: precise - compiler: clang os: osx env: TEST=osx diff --git a/scripts/test.sh b/scripts/test.sh index 595fa5f0e..a91086422 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -72,7 +72,8 @@ win*) ;; win32) CONFIG="--host=i686-w64-mingw32 $CONFIG" - DEPS="gcc-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-i686-dev $DEPS" + # currently only works on 12.04, so use mingw-w64-dev instead of mingw-w64-i686-dev + DEPS="gcc-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-dev $DEPS" CC="i686-w64-mingw32-gcc" ;; esac