Merge branch 'master' into sdl2

Conflicts:
	.travis.yml

.travis.yml

@@ -1,8 +1,15 @@
 language: c
-compiler:
-  - gcc
-  - clang
-  - i686-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
 
@@ -10,7 +17,7 @@ before_install:
   - echo "yes" | sudo apt-add-repository ppa:zoogie/sdl2-snapshots
   - sudo apt-get update -qq
   - sudo apt-get remove -qq -y mingw32
-  - sudo apt-get install -q -y libgl1-mesa-dev libsdl2-dev libvorbis-dev libfreetype6-dev mingw-w64
+  - sudo apt-get install -q -y libgl1-mesa-dev libsdl2-dev libfreetype6-dev mingw-w64
 
 notifications:
   email: false