diff options
| author | Zack Middleton <zturtleman@gmail.com> | 2013-03-12 16:33:49 -0500 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-03-19 16:41:19 +0000 |
| commit | 9ffe36a193581b5bd037cbe829e640cf79be6f9c (patch) | |
| tree | 2596426cfde4ee2905efa938ada8250cdc6e0cac | |
| parent | 0080dd9ecfae27025044c3875c937aeca3cf2584 (diff) | |
Move mingw to separate build job on travis-ci
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | build-test.sh | 21 |
2 files changed, 10 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index b7cd2269..cdad48e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: c compiler: - gcc - clang + - i686-w64-mingw32-gcc script: ./build-test.sh diff --git a/build-test.sh b/build-test.sh index 9b984e72..d40587bf 100755 --- a/build-test.sh +++ b/build-test.sh @@ -2,21 +2,18 @@ failed=0; +# check if testing mingw +if [ "$CC" = "i686-w64-mingw-gcc" ]; then + MAKE=./cross-make-mingw.sh +else + MAKE=make +fi + # Default Build -(make clean release) || failed=1; +($MAKE clean release) || failed=1; # Test additional options -(make clean release USE_CODEC_VORBIS=1 USE_FREETYPE=1 CFLAGS=-DRAVENMD4) || failed=1; - -# Test mingw -if [ "$CC" = "clang" ]; then - # skip mingw if travis-ci clang build - echo "Skipping mingw build because there is no mingw clang compiler available."; -else - # clear CC so cross-make-mingw script will set it. - export CC= - (exec ./cross-make-mingw.sh clean release) || failed=1; -fi +($MAKE clean release USE_CODEC_VORBIS=1 USE_FREETYPE=1 CFLAGS=-DRAVENMD4) || failed=1; if [ $failed -eq 1 ]; then echo "Build failure."; |