From b458d570a1b70dce15a5fd62af567c08c1e4fe92 Mon Sep 17 00:00:00 2001
From: xawotihs <xawotihs@gmail.com>
Date: Sun, 11 Oct 2015 14:15:43 +0200
Subject: [PATCH] Deactivated again Android build, added a SDL build

---
 .travis.yml            | 10 ++++++----
 tools/travis-script.sh |  8 ++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e2a5c227..755f9bf52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,8 @@ branches:
 
 before_install:
   - export BUILD_PSP=YES
-  - export BUILD_ANDROID=YES
+  - export BUILD_ANDROID=NO
+  - export BUILD_SDL=YES
   - export BUILD_Qt=YES
   - export BUILD_MAC=YES
   - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty universe"
@@ -35,12 +36,13 @@ before_install:
       sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev &&
       export QMAKE="qmake -qt=qt5";
     fi
+# Building for SDL here
+  - if [ "$BUILD_SDL" == "YES" ]; then
+      sudo apt-get install -qq sdl2-dev &&
+    fi
 
 install:
 - sudo apt-get install --force-yes -qq libtinyxml-dev libjpeg-dev libpng-dev libgif-dev libz-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev
-- curl -O https://www.libsdl.org/release/SDL2-2.0.3.tar.gz
-- tar -xzvf SDL2-2.0.3.tar.gz
-- mv SDL2-2.0.3 thirdparty/SDL2
 - if [ "$BUILD_PSP" == "YES" ]; then
     tar -x --xz -f sdk.lzma;
   fi
diff --git a/tools/travis-script.sh b/tools/travis-script.sh
index 073c85b06..682f2a3ca 100755
--- a/tools/travis-script.sh
+++ b/tools/travis-script.sh
@@ -71,6 +71,14 @@ if [ "$BUILD_Qt" = "YES" ]; then
     cd ../..
 fi
 
+# we're building a SDL version
+if [ "$BUILD_SDL" = "YES" ]; then
+	mkdir build_SDL
+	cd build_SDL
+	cmake -Dbackend_sdl=ON ..
+	make -j8
+	cd ..
+fi
 # Let's launch de Mac cross-compilation
 if [ "$BUILD_MAC" = "YES" ]; then
     ./tools/build-macos-script.sh