diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-04-03 22:56:50 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-04-03 22:56:50 +0200 |
| commit | e3905cdfd8a3570090d9e1da42296035bffe06af (patch) | |
| tree | 717b4899f1383de9186ce1bca6644c70520da931 | |
| parent | Merge pull request #1638 from JayFoxRox/check-fb-complete (diff) | |
| parent | travis: Update dependencies (diff) | |
| download | yuzu-e3905cdfd8a3570090d9e1da42296035bffe06af.tar yuzu-e3905cdfd8a3570090d9e1da42296035bffe06af.tar.gz yuzu-e3905cdfd8a3570090d9e1da42296035bffe06af.tar.bz2 yuzu-e3905cdfd8a3570090d9e1da42296035bffe06af.tar.lz yuzu-e3905cdfd8a3570090d9e1da42296035bffe06af.tar.xz yuzu-e3905cdfd8a3570090d9e1da42296035bffe06af.tar.zst yuzu-e3905cdfd8a3570090d9e1da42296035bffe06af.zip | |
| -rwxr-xr-x | .travis-build.sh | 4 | ||||
| -rwxr-xr-x | .travis-deps.sh | 4 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
4 files changed, 7 insertions, 7 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 CXX=g++-4.9 + export CC=gcc-5 + 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 CXX=g++-4.9 + export CC=gcc-5 + 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 - - g++-4.9 + - gcc-5 + - g++-5 - xorg-dev - lib32stdc++6 # For CMake - lftp # To upload builds diff --git a/CMakeLists.txt b/CMakeLists.txt index d6a4a915a..3a0a161e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ endif() message(STATUS "Target architecture: ${ARCHITECTURE}") if (NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes -pthread") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes -pthread") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") if (ARCHITECTURE_x86_64) |