diff options
| author | Sam Spilsbury <smspillaz@gmail.com> | 2016-04-25 03:40:12 +0200 |
|---|---|---|
| committer | Sam Spilsbury <smspillaz@gmail.com> | 2016-04-25 04:18:40 +0200 |
| commit | 599dc2bbb5e7325b9baa8d55ef17915dd283173d (patch) | |
| tree | e691188c0807876d339546e14e41cb916ed24c0e | |
| parent | shader: Shader size is long uint, not uint. (diff) | |
| download | yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.tar yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.tar.gz yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.tar.bz2 yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.tar.lz yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.tar.xz yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.tar.zst yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.zip | |
| -rwxr-xr-x | .travis-deps.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh index c7bb7e785..4a79feb70 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -9,7 +9,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then export CXX=g++-5 mkdir -p $HOME/.local - curl -L http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \ + curl -L http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-i386.tar.gz \ | tar -xz -C $HOME/.local --strip-components=1 ( @@ -20,6 +20,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then ) elif [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null # silence the very verbose output - brew install qt5 sdl2 dylibbundler + brew unlink cmake + brew install cmake31 qt5 sdl2 dylibbundler gem install xcpretty fi |