diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-15 22:15:08 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-15 22:15:08 -0500 |
| commit | cd2a31eaf4a35568a18840eba7d3cdac59881d2f (patch) | |
| tree | 37a4d61adebae300e8ef172538c6a2d2eae80ff1 /CMakeLists.txt | |
| parent | 1249454b7cefbbc02a0d2f4ed88816b1ac7fb1e1 (diff) | |
| parent | 666f6deb47774ad101710f619fb9ac66514b3012 (diff) | |
Merge pull request #283 from yuriks/archive-refactor
Archive refactor
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61d5d524a..63738b5ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,8 @@ cmake_minimum_required(VERSION 2.8.11) project(citra) if (NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes") + # -std=c++14 is only supported on very new compilers, so use the old c++1y alias instead. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes") else() # Silence deprecation warnings add_definitions(/D_CRT_SECURE_NO_WARNINGS) |