diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common.gypi | 6 | ||||
| -rw-r--r-- | gyp/ios.gyp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index fbfa687117..af3f1bffc3 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -8,7 +8,7 @@ ['OS=="mac"', { 'xcode_settings': { 'CLANG_CXX_LIBRARY': 'libc++', - 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', + 'CLANG_CXX_LANGUAGE_STANDARD': 'c++14', 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', 'GCC_ENABLE_CPP_RTTI': 'YES', @@ -27,14 +27,14 @@ }, }, { 'cflags_cc': [ - '-std=c++11', + '-std=c++14', '-Werror', '-Wall', '-Wextra', '-Wshadow', '-Wno-variadic-macros', '-Wno-error=unused-parameter', - '-Wno-unknown-warning-option', + '-Wno-c++1y-extensions', '-frtti', '-fexceptions', ], diff --git a/gyp/ios.gyp b/gyp/ios.gyp index 989f34cb72..f26ec3772c 100644 --- a/gyp/ios.gyp +++ b/gyp/ios.gyp @@ -1,5 +1,6 @@ { 'includes': [ '../ios/app/mapboxgl-app.gypi', + '../ios/benchmark/benchmark-ios.gypi', ], } |