summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-07-10 20:04:28 -0300
committerGravatar Yuri Kunde Schlesner2015-07-10 20:11:09 -0300
commita60f2a93d24237a44b3ca5bd113c4f5283de8384 (patch)
tree6078c887be01f332159bc82843eab20daad33cf7
parentTravis: Remove use of sudo to enable use container-based builds (diff)
downloadyuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.tar.gz
yuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.tar.xz
yuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.zip
Travis: Update GLFW on Linux to 3.1.1
-rwxr-xr-x.travis-deps.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh
index 6ab71a4ab..d10973410 100755
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -7,10 +7,13 @@ set -x
7if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then 7if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
8 export CC=gcc-4.9 8 export CC=gcc-4.9
9 export CXX=g++-4.9 9 export CXX=g++-4.9
10
11 mkdir -p $HOME/.local 10 mkdir -p $HOME/.local
11
12 curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \
13 | tar -xz -C $HOME/.local --strip-components=1
14
12 ( 15 (
13 git clone https://github.com/glfw/glfw.git --branch 3.0.4 --depth 1 16 git clone https://github.com/glfw/glfw.git --branch 3.1.1 --depth 1
14 mkdir glfw/build && cd glfw/build 17 mkdir glfw/build && cd glfw/build
15 cmake -DBUILD_SHARED_LIBS=ON \ 18 cmake -DBUILD_SHARED_LIBS=ON \
16 -DGLFW_BUILD_EXAMPLES=OFF \ 19 -DGLFW_BUILD_EXAMPLES=OFF \
@@ -20,9 +23,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
20 make -j4 && make install 23 make -j4 && make install
21 ) 24 )
22 25
23 curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \
24 | tar -xz -C $HOME/.local --strip-components=1
25
26elif [ "$TRAVIS_OS_NAME" = "osx" ]; then 26elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
27 brew tap homebrew/versions 27 brew tap homebrew/versions
28 brew install qt5 glfw3 pkgconfig 28 brew install qt5 glfw3 pkgconfig