diff --git a/.travis.yml b/.travis.yml
index 3d09c7b62007312a91dbb2c19911b6b993b0bbda..291d2fc3fe34be2705f4df681d1323d0e19aeb96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,55 +7,91 @@ matrix:
         - os: linux
           compiler: gcc
         - os: linux
-          compiler: clang
-        - os: osx
-          osx_image: beta-xcode6.1
-          compiler: gcc
-        - os: osx
-          osx_image: beta-xcode6.1
-          compiler: clang
-        - os: osx
-          osx_image: beta-xcode6.2
-          compiler: gcc
-        - os: osx
-          osx_image: beta-xcode6.2
-          compiler: clang
-        - os: osx
-          osx_image: beta-xcode6.3
-          compiler: gcc
-        - os: osx
-          osx_image: beta-xcode6.3
-          compiler: clang
-        - os: osx
-          osx_image: xcode6.4
           compiler: gcc
-        - os: osx
-          osx_image: xcode6.4
-          compiler: clang
-        - os: osx
-          osx_image: xcode7
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              packages:
+              - gcc-4.8
+              env: CC=gcc-4.8
+        - os: linux
           compiler: gcc
-        - os: osx
-          osx_image: xcode7
-          compiler: clang
-        - os: osx
-          osx_image: xcode7.1
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              packages:
+              - gcc-4.9
+              env: CC=gcc-4.9
+        - os: linux
           compiler: gcc
-        - os: osx
-          osx_image: xcode7.1
-          compiler: clang
-        - os: osx
-          osx_image: xcode7.2
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              packages:
+              - gcc-5
+              env: CC=gcc-5
+        - os: linux
           compiler: gcc
-        - os: osx
-          osx_image: xcode7.2
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              packages:
+              - gcc-6
+              env: CC=gcc-6
+        - os: linux
           compiler: clang
         - os: osx
-          osx_image: xcode7.3
+          osx_image: beta-xcode6.1
           compiler: gcc
         - os: osx
-          osx_image: xcode7.3
+          osx_image: beta-xcode6.1
           compiler: clang
+#        - os: osx
+#          osx_image: beta-xcode6.2
+#          compiler: gcc
+#       - os: osx
+#         osx_image: beta-xcode6.2
+#         compiler: clang#
+#       - os: osx
+#         osx_image: beta-xcode6.3
+#         compiler: gcc
+#       - os: osx
+#         osx_image: beta-xcode6.3
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode6.4
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode6.4
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode7
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode7
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode7.1
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode7.1
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode7.2
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode7.2
+#         compiler: clang
+#       - os: osx
+#         osx_image: xcode7.3
+#         compiler: gcc
+#       - os: osx
+#         osx_image: xcode7.3
+#         compiler: clang
 
 cache:
   apt:  true
@@ -73,6 +109,7 @@ addons:
     - p7zip-full
 
 before_script:
+  - $CC --version
   - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2115-assets-2.7z -O $HOME/srb2_cache/SRB2-v2115-assets-2.7z
   - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
   - mkdir build
@@ -82,7 +119,7 @@ before_script:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl2_mixer game-music-emu p7zip ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sdl2_mixer game-music-emu p7zip cmake; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/release/SDL2-2.0.4.dmg; hdiutil attach SDL2-2.0.4.dmg; sudo cp -a /Volumes/SDL2/SDL2.framework /Library/Frameworks/; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -O -L https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.dmg; hdiutil attach SDL2_mixer-2.0.1.dmg; sudo cp -a /Volumes/SDL2_mixer/SDL2_mixer.framework /Library/Frameworks/; fi
   - mkdir -p $HOME/srb2_cache