diff options
author | James <jselby@jselby.net> | 2017-08-04 12:11:47 +0200 |
---|---|---|
committer | James <jselby@jselby.net> | 2017-08-10 12:13:59 +0200 |
commit | fa64309aace2b782029ef599d20e8e0f1dd72a83 (patch) | |
tree | 987e0c199f24dec24f64d3a1d6403b09215a2b71 /.travis-deps.sh | |
parent | Merge pull request #2868 from wwylele/swr-tuple (diff) | |
download | yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.gz yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.bz2 yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.lz yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.xz yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.tar.zst yuzu-fa64309aace2b782029ef599d20e8e0f1dd72a83.zip |
Diffstat (limited to '')
-rwxr-xr-x | .travis-deps.sh | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh index 25a287c7f..0cee68041 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -5,35 +5,7 @@ set -x #if OS is linux or is not set if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then - export CC=gcc-6 - export CXX=g++-6 - mkdir -p $HOME/.local - - if [ ! -e $HOME/.local/bin/cmake ]; then - echo "CMake not found in the cache, get and extract it..." - curl -L http://www.cmake.org/files/v3.6/cmake-3.6.3-Linux-x86_64.tar.gz \ - | tar -xz -C $HOME/.local --strip-components=1 - else - echo "Using cached CMake" - fi - - if [ ! -e $HOME/.local/lib/libSDL2.la ]; then - echo "SDL2 not found in cache, get and build it..." - wget http://libsdl.org/release/SDL2-2.0.5.tar.gz -O - | tar xz - cd SDL2-2.0.5 - ./configure --prefix=$HOME/.local - make -j4 && make install - else - echo "Using cached SDL2" - fi - - export DEBIAN_FRONTEND=noninteractive - # Amazing placebo security - curl http://apt.llvm.org/llvm-snapshot.gpg.key | sudo -E apt-key add - - sudo -E add-apt-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main" - sudo -E apt-get -yq update - sudo -E apt-get -yq install clang-format-3.9 - + docker pull ubuntu:16.04 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update brew install qt5 sdl2 dylibbundler p7zip |