Try to fix Travis CI MinGW builds

Listing i686-w64-mingw32-gcc as a compiler stopped working.
Travis tries to print version before installing it.

$ i686-w64-mingw32-gcc --version

/home/travis/build.sh: line 201: i686-w64-mingw32-gcc: command not found

The command "i686-w64-mingw32-gcc --version" failed and exited with 127 during setup.
This commit is contained in:
Zack Middleton 2014-05-19 17:27:25 -05:00
parent a3c2f77236
commit 494789664e
2 changed files with 12 additions and 26 deletions

View file

@ -1,9 +1,15 @@
language: c
compiler:
- gcc
- clang
- i686-w64-mingw32-gcc
- x86_64-w64-mingw32-gcc
env:
# standard builds
- CC=gcc
- CC=clang
# extra libs
- CC=gcc USE_CODEC_VORBIS=1 USE_FREETYPE=1
- CC=clang USE_CODEC_VORBIS=1 USE_FREETYPE=1
# cross-compile using mingw
- CC= PLATFORM="mingw32" ARCH="x86"
- CC= PLATFORM="mingw32" ARCH="x86_64"
script: ./travis-ci-build.sh

View file

@ -2,33 +2,13 @@
failed=0;
# check if testing mingw
if [ "$CC" = "i686-w64-mingw32-gcc" ]; then
export PLATFORM=mingw32
export ARCH=x86
export CC=
haveExternalLibs=0
elif [ "$CC" = "x86_64-w64-mingw32-gcc" ]; then
export PLATFORM=mingw32
export ARCH=x86_64
export CC=
haveExternalLibs=0
else
haveExternalLibs=1
fi
# Default Build
(make clean release) || failed=1;
# Test additional options
if [ $haveExternalLibs -eq 1 ]; then
(make clean release USE_CODEC_VORBIS=1 USE_FREETYPE=1) || failed=1;
fi
if [ $failed -eq 1 ]; then
echo "Build failure.";
else
echo "All builds successful.";
echo "Build successful.";
fi
exit $failed;