diff options
author | bunnei <bunneidev@gmail.com> | 2014-12-16 04:15:08 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-12-16 04:15:08 +0100 |
commit | cd2a31eaf4a35568a18840eba7d3cdac59881d2f (patch) | |
tree | 37a4d61adebae300e8ef172538c6a2d2eae80ff1 /.travis-deps.sh | |
parent | Update README.md (diff) | |
parent | Work around libstdc++'s lack of support for std::hash on enums (diff) | |
download | yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.gz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.bz2 yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.lz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.xz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.zst yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.zip |
Diffstat (limited to '.travis-deps.sh')
-rw-r--r-- | .travis-deps.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh index b8e8417b2..8e22a6358 100644 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -1,13 +1,14 @@ #!/bin/sh set -e +set -x #if OS is linux or is not set if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt-get -qq update - sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libxcursor-dev - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 + sudo apt-get -qq install g++-4.9 xorg-dev libglu1-mesa-dev libxcursor-dev + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90 ( git clone https://github.com/glfw/glfw.git --branch 3.0.4 --depth 1 mkdir glfw/build && cd glfw/build |