From 97fc98d26b61b5f79e32963405f795e21bb4e3a4 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Wed, 6 Mar 2013 18:00:03 -0600 Subject: [PATCH] Improve build-test.sh for non-travis-ci usage --- build-test.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build-test.sh b/build-test.sh index db582c0c..afdedc10 100755 --- a/build-test.sh +++ b/build-test.sh @@ -9,17 +9,20 @@ failed=0; make clean (make USE_CODEC_VORBIS=1 USE_FREETYPE=1 CFLAGS=-DRAVENMD4) || failed=1; -# Test mingw (gcc) -if [ "$CC" = "gcc" ]; then - # clear CC so script will set it. - export CC= - (exec ./cross-make-mingw.sh) || 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) || failed=1; fi if [ $failed -eq 1 ]; then - echo "Build failure."; + echo "Build failure."; else - echo "All builds successful."; + echo "All builds successful."; fi exit $failed;