From e5a60d34ccd2f63d02db25527157d42aae90c8e8 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 31 Oct 2021 11:52:06 +0200 Subject: [PATCH] CREATE_PROJECT: Enable C++11 for Xcode by default --- devtools/create_project/xcode.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index cf7784bb2f1..2415fd871ab 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -970,9 +970,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) { ADD_SETTING(scummvm_Debug, "ALWAYS_SEARCH_USER_PATHS", "NO"); ADD_SETTING_QUOTE(scummvm_Debug, "USER_HEADER_SEARCH_PATHS", "$(SRCROOT) $(SRCROOT)/engines"); ADD_SETTING(scummvm_Debug, "CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED", "YES"); - if (CONTAINS_DEFINE(setup.defines, "USE_CXX11")) { - ADD_SETTING(scummvm_Debug, "CLANG_CXX_LANGUAGE_STANDARD", "\"c++0x\""); - } + ADD_SETTING(scummvm_Debug, "CLANG_CXX_LANGUAGE_STANDARD", "\"c++0x\""); ADD_SETTING(scummvm_Debug, "CLANG_WARN_BOOL_CONVERSION", "YES"); ADD_SETTING(scummvm_Debug, "CLANG_WARN_CONSTANT_CONVERSION", "YES"); ADD_SETTING(scummvm_Debug, "CLANG_WARN_EMPTY_BODY", "YES"); @@ -1131,9 +1129,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) { ADD_SETTING(scummvmOSX_Debug, "COPY_PHASE_STRIP", "NO"); ADD_SETTING_QUOTE(scummvmOSX_Debug, "DEBUG_INFORMATION_FORMAT", "dwarf"); ADD_SETTING_QUOTE(scummvmOSX_Debug, "FRAMEWORK_SEARCH_PATHS", ""); - if (CONTAINS_DEFINE(setup.defines, "USE_CXX11")) { - ADD_SETTING(scummvmOSX_Debug, "CLANG_CXX_LANGUAGE_STANDARD", "\"c++0x\""); - } + ADD_SETTING(scummvmOSX_Debug, "CLANG_CXX_LANGUAGE_STANDARD", "\"c++0x\""); ADD_SETTING(scummvmOSX_Debug, "GCC_C_LANGUAGE_STANDARD", "c99"); ADD_SETTING(scummvmOSX_Debug, "GCC_ENABLE_CPP_EXCEPTIONS", "NO"); ADD_SETTING(scummvmOSX_Debug, "GCC_ENABLE_CPP_RTTI", "YES");