diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-11 01:04:28 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-11 01:11:09 +0200 |
| commit | a60f2a93d24237a44b3ca5bd113c4f5283de8384 (patch) | |
| tree | 6078c887be01f332159bc82843eab20daad33cf7 | |
| parent | Travis: Remove use of sudo to enable use container-based builds (diff) | |
| download | yuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.tar yuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.tar.gz yuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.tar.bz2 yuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.tar.lz yuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.tar.xz yuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.tar.zst yuzu-a60f2a93d24237a44b3ca5bd113c4f5283de8384.zip | |
| -rwxr-xr-x | .travis-deps.sh | 10 |
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 if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then export CC=gcc-4.9 export CXX=g++-4.9 - mkdir -p $HOME/.local + + curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \ + | tar -xz -C $HOME/.local --strip-components=1 + ( - git clone https://github.com/glfw/glfw.git --branch 3.0.4 --depth 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 \ @@ -20,9 +23,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then make -j4 && make install ) - curl http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \ - | tar -xz -C $HOME/.local --strip-components=1 - elif [ "$TRAVIS_OS_NAME" = "osx" ]; then brew tap homebrew/versions brew install qt5 glfw3 pkgconfig |