From ba2a54a9dd6e5a263c5e6886e55b3bc55b95b4ab Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Tue, 1 Mar 2016 17:24:18 +0000
Subject: Dependencies: Remove GLFW, Add SDL2

citra: Remove GLFW, Add SDL2

FindSDL2: Do not CACHE SDL2_* variables if library is not found

EmuWindow_SDL2: Set minimal client area at initialisation time

EmuWindow_SDL2: Corrections

EmuWindow_SDL2: Fix no decorations on startup on OS X

cmake: windows_copy_files
---
 .travis-deps.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to '.travis-deps.sh')

diff --git a/.travis-deps.sh b/.travis-deps.sh
index 4b907abb3..bab90d307 100755
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -13,18 +13,13 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
         | tar -xz -C $HOME/.local --strip-components=1
 
     (
-        git clone https://github.com/glfw/glfw.git --branch 3.1.1 --depth 1
-        mkdir glfw/build && cd glfw/build
-        cmake -DBUILD_SHARED_LIBS=ON \
-              -DGLFW_BUILD_EXAMPLES=OFF \
-              -DGLFW_BUILD_TESTS=OFF \
-              -DCMAKE_INSTALL_PREFIX=$HOME/.local \
-              ..
+        wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz
+        cd SDL2-2.0.4
+        ./configure --prefix=$HOME/.local
         make -j4 && make install
     )
-
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     brew update > /dev/null # silence the very verbose output
-    brew install qt5 glfw3
+    brew install qt5 sdl2
     gem install xcpretty
 fi
-- 
cgit v1.2.3