diff options
-rw-r--r-- | .travis/flags.sh | 2 | ||||
-rw-r--r-- | CMakeLists.txt | 7 | ||||
-rw-r--r-- | toxcore/ccompat.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/.travis/flags.sh b/.travis/flags.sh index 0c80e703..a617ec8e 100644 --- a/.travis/flags.sh +++ b/.travis/flags.sh | |||
@@ -28,6 +28,8 @@ add_flag -O3 -march=native | |||
28 | 28 | ||
29 | # Warn on non-ISO C. | 29 | # Warn on non-ISO C. |
30 | add_c_flag -pedantic | 30 | add_c_flag -pedantic |
31 | add_c_flag -std=c99 | ||
32 | add_cxx_flag -std=c++11 | ||
31 | 33 | ||
32 | add_flag -g3 | 34 | add_flag -g3 |
33 | add_flag -ftrapv | 35 | add_flag -ftrapv |
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bbff255..c3f3d52d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -77,7 +77,12 @@ enable_testing() | |||
77 | 77 | ||
78 | set(CMAKE_MACOSX_RPATH ON) | 78 | set(CMAKE_MACOSX_RPATH ON) |
79 | 79 | ||
80 | if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1.0") | 80 | if(${CMAKE_VERSION} VERSION_LESS "3.1.0") |
81 | if(NOT MSVC) | ||
82 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") | ||
83 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") | ||
84 | endif() | ||
85 | else() | ||
81 | # Set standard version for compiler. | 86 | # Set standard version for compiler. |
82 | set(CMAKE_C_STANDARD 99) | 87 | set(CMAKE_C_STANDARD 99) |
83 | set(CMAKE_CXX_STANDARD 11) | 88 | set(CMAKE_CXX_STANDARD 11) |
diff --git a/toxcore/ccompat.h b/toxcore/ccompat.h index f4aa1d89..5b37a294 100644 --- a/toxcore/ccompat.h +++ b/toxcore/ccompat.h | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #ifndef __cplusplus | 41 | #if !defined(__cplusplus) || __cplusplus < 201103L |
42 | #define nullptr NULL | 42 | #define nullptr NULL |
43 | #endif | 43 | #endif |
44 | 44 | ||