diff --git a/.travis.yml b/.travis.yml
index 326b7c35..21f80696 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
 
diff --git a/travis-ci-build.sh b/travis-ci-build.sh
index 97b49699..008bc7e1 100755
--- a/travis-ci-build.sh
+++ b/travis-ci-build.sh
@@ -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;