travis: Update dependencies

author: Lioncash 2016-04-03 15:26:28 -0400
committer: Lioncash 2016-04-03 15:45:48 -0400
commit: 5181b4a0df466cde55a2459290414a7d056065ba (patch)
tree: 717b4899f1383de9186ce1bca6644c70520da931
parent: CMakeFiles: Compile as C++14 (diff)
download: yuzu-5181b4a0df466cde55a2459290414a7d056065ba.tar.gz
yuzu-5181b4a0df466cde55a2459290414a7d056065ba.tar.xz
yuzu-5181b4a0df466cde55a2459290414a7d056065ba.zip
3 files changed, 6 insertions, 6 deletions
diff --git a/.travis-build.sh b/.travis-build.sh
index 22a3a9fd6..e06a4299b 100755
--- a/.travis-build.sh
+++ b/.travis-build.sh
@@ -11,8 +11,8 @@ fi
 #if OS is linux or is not set
 if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-    export CC=gcc-4.9
+    export CC=gcc-5
-    export CXX=g++-4.9
+    export CXX=g++-5
    export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
    mkdir build && cd build
diff --git a/.travis-deps.sh b/.travis-deps.sh
index eb99ead4f..c7bb7e785 100755
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -5,8 +5,8 @@ set -x
 #if OS is linux or is not set
 if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-    export CC=gcc-4.9
+    export CC=gcc-5
-    export CXX=g++-4.9
+    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 \
diff --git a/.travis.yml b/.travis.yml
index 2e875cccf..8d86baece 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,8 @@ addons:
    sources:
      - ubuntu-toolchain-r-test
    packages:
-      - gcc-4.9
+      - gcc-5
-      - g++-4.9
+      - g++-5
      - xorg-dev
      - lib32stdc++6 # For CMake
      - lftp # To upload builds
author	Lioncash	2016-04-03 15:26:28 -0400
committer	Lioncash	2016-04-03 15:45:48 -0400
commit	5181b4a0df466cde55a2459290414a7d056065ba (patch)
tree	717b4899f1383de9186ce1bca6644c70520da931
parent	CMakeFiles: Compile as C++14 (diff)
download	yuzu-5181b4a0df466cde55a2459290414a7d056065ba.tar.gz yuzu-5181b4a0df466cde55a2459290414a7d056065ba.tar.xz yuzu-5181b4a0df466cde55a2459290414a7d056065ba.zip

diff --git a/.travis-build.sh b/.travis-build.sh index 22a3a9fd6..e06a4299b 100755 --- a/.travis-build.sh +++ b/.travis-build.sh
@@ -11,8 +11,8 @@ fi
11		11
12	#if OS is linux or is not set	12	#if OS is linux or is not set
13	if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then	13	if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
14	export CC=gcc-4.9	14	export CC=gcc-5
15	export CXX=g++-4.9	15	export CXX=g++-5
16	export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH	16	export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
17		17
18	mkdir build && cd build	18	mkdir build && cd build


diff --git a/.travis-deps.sh b/.travis-deps.sh index eb99ead4f..c7bb7e785 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh
@@ -5,8 +5,8 @@ set -x
5		5
6	#if OS is linux or is not set	6	#if OS is linux or is not set
7	if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then	7	if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
8	export CC=gcc-4.9	8	export CC=gcc-5
9	export CXX=g++-4.9	9	export CXX=g++-5
10	mkdir -p $HOME/.local	10	mkdir -p $HOME/.local
11		11
12	curl -L http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \	12	curl -L http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \


diff --git a/.travis.yml b/.travis.yml index 2e875cccf..8d86baece 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -15,8 +15,8 @@ addons:
15	sources:	15	sources:
16	- ubuntu-toolchain-r-test	16	- ubuntu-toolchain-r-test
17	packages:	17	packages:
18	- gcc-4.9	18	- gcc-5
19	- g++-4.9	19	- g++-5
20	- xorg-dev	20	- xorg-dev
21	- lib32stdc++6 # For CMake	21	- lib32stdc++6 # For CMake
22	- lftp # To upload builds	22	- lftp # To upload builds