diff -r 7038ecc1f7fa -r 1ae8d4582e1e .travis.yml
--- a/.travis.yml	Sun Nov 15 14:40:51 2015 +0100
+++ b/.travis.yml	Sun Nov 15 14:42:59 2015 +0100
@@ -6,24 +6,18 @@
   - gcc
   - clang
 env:
-  # Default build. Release.
   - BUILD_ARGS="-DCMAKE_BUILD_TYPE=Release"
-  # Debug build
   - BUILD_ARGS="-DCMAKE_BUILD_TYPE=Debug"
-  # Everything that's optional
-  - BUILD_ARGS="-DBUILD_ENGINE_C=1"
-  - BUILD_ARGS="-DNOPNG=1"
-  - BUILD_ARGS="-DNOVIDEOREC=1"
-  - BUILD_ARGS="-DNOSERVER=1"
-  - BUILD_ARGS="-DLUA_SYSTEM=0"
-  - BUILD_ARGS="-DPHYSFS_SYSTEM=0"
-  - BUILD_ARGS="-DGL2=1"
+  - BUILD_ARGS="-DNOSERVER=1 -DBUILD_ENGINE_C=1"
+  - BUILD_ARGS="-DNOSERVER=1 -DNOVIDEOREC=1 -DNOPNG=1"
+  - BUILD_ARGS="-DNOSERVER=1 -DLUA_SYSTEM=0 -DPHYSFS_SYSTEM=0"
 matrix:
   allow_failures:
     # Failures we expect here
 before_install:
+  - sudo add-apt-repository -y ppa:zoogie/sdl2-snapshots
   - sudo apt-get update -qq
-  - sudo apt-get install debhelper cmake dpkg-dev libqt4-dev qt4-qmake libphysfs-dev libsdl1.2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libsdl-net1.2-dev bzip2 ghc libghc-mtl-dev libghc-parsec3-dev libghc-bytestring-show-dev libghc-vector-dev libghc-zlib-dev libghc-random-dev libghc-stm-dev libghc-network-dev libghc-dataenc-dev libghc-hslogger-dev libghc-utf8-string-dev libghc-sha-dev libghc-entropy-dev liblua5.1-0-dev imagemagick fpc fp-compiler fp-units-misc libpng-dev fp-units-gfx libavcodec-dev libavformat-dev freeglut3-dev libglew1.6-dev
+  - sudo apt-get install debhelper cmake dpkg-dev libqt4-dev qt4-qmake libphysfs-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev libsdl2-net-dev bzip2 ghc libghc-mtl-dev libghc-parsec3-dev libghc-bytestring-show-dev libghc-vector-dev libghc-zlib-dev libghc-random-dev libghc-stm-dev libghc-network-dev libghc-dataenc-dev libghc-hslogger-dev libghc-utf8-string-dev libghc-sha-dev libghc-entropy-dev liblua5.1-0-dev imagemagick fpc fp-compiler fp-units-misc libpng-dev fp-units-gfx libavcodec-dev libavformat-dev
 script: 
   - mkdir build && cd build && cmake $BUILD_ARGS .. && make VERBOSE=1 && make test_verbose
 notifications: