summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2014-12-15 21:55:28 -0200
committerGravatar Yuri Kunde Schlesner2014-12-15 22:07:40 -0200
commitb5d9f7364e18aa2f596f6c8a466b1544a6c33a59 (patch)
treee4d8b0263d7c28dc76095a198b4447f8330a6d20
parentTravis: Enable tracing on the script to ease troubleshooting (diff)
downloadyuzu-b5d9f7364e18aa2f596f6c8a466b1544a6c33a59.tar.gz
yuzu-b5d9f7364e18aa2f596f6c8a466b1544a6c33a59.tar.xz
yuzu-b5d9f7364e18aa2f596f6c8a466b1544a6c33a59.zip
Travis: Use gcc 4.9 instead of 4.8 since it's getting installed anyway
-rw-r--r--.travis-deps.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh
index c8a06e0a8..8e22a6358 100644
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -7,8 +7,8 @@ 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 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y 8 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
9 sudo apt-get -qq update 9 sudo apt-get -qq update
10 sudo apt-get -qq install g++-4.8 xorg-dev libglu1-mesa-dev libxcursor-dev 10 sudo apt-get -qq install g++-4.9 xorg-dev libglu1-mesa-dev libxcursor-dev
11 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 11 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 90
12 ( 12 (
13 git clone https://github.com/glfw/glfw.git --branch 3.0.4 --depth 1 13 git clone https://github.com/glfw/glfw.git --branch 3.0.4 --depth 1
14 mkdir glfw/build && cd glfw/build 14 mkdir glfw/build && cd glfw/build