Aleksei Kuzmin 2017-11-16 12:27:10 +03:00 committed by Cheng Zhao
parent 9d6db65c7c
commit dda64bd652
2 changed files with 3 additions and 3 deletions

View file

@ -31,7 +31,7 @@
'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
'GCC_ENABLE_CPP_RTTI': 'NO', 'GCC_ENABLE_CPP_RTTI': 'NO',
'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES', 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', 'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
'MACOSX_DEPLOYMENT_TARGET': '10.9', 'MACOSX_DEPLOYMENT_TARGET': '10.9',
'RUN_CLANG_STATIC_ANALYZER': 'YES', 'RUN_CLANG_STATIC_ANALYZER': 'YES',
'USE_HEADER_MAP': 'NO', 'USE_HEADER_MAP': 'NO',

View file

@ -111,7 +111,7 @@
], ],
'target_defaults': { 'target_defaults': {
'cflags_cc': [ 'cflags_cc': [
'-std=c++11', '-std=c++14',
], ],
'xcode_settings': { 'xcode_settings': {
'CC': '<(make_clang_dir)/bin/clang', 'CC': '<(make_clang_dir)/bin/clang',
@ -122,7 +122,7 @@
'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99 'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99
'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++ 'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11 'CLANG_CXX_LANGUAGE_STANDARD': 'c++14', # -std=c++14
}, },
'target_conditions': [ 'target_conditions': [
['_type in ["executable", "shared_library"]', { ['_type in ["executable", "shared_library"]', {