From a876e1f633c733c19ac921708525e9da61e3917a Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sun, 28 Nov 2021 00:45:48 +0100 Subject: [PATCH] Removed unused macro for Xcode builds Signed-off-by: Alexander Borsuk --- xcode/common-debug.xcconfig | 2 +- xcode/common-release.xcconfig | 2 +- xcode/freetype/freetype.xcodeproj/project.pbxproj | 7 ------- xcode/protobuf/protobuf.xcodeproj/project.pbxproj | 8 ++++++++ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/xcode/common-debug.xcconfig b/xcode/common-debug.xcconfig index 09653abbef..0f729d9001 100644 --- a/xcode/common-debug.xcconfig +++ b/xcode/common-debug.xcconfig @@ -4,7 +4,7 @@ COPY_PHASE_STRIP = NO ENABLE_NS_ASSERTIONS = YES ENABLE_TESTABILITY = YES GCC_OPTIMIZATION_LEVEL = 0 -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG _DEBUG HAVE_PTHREAD +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG _DEBUG GCC_UNROLL_LOOPS = NO MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE OTHER_SWIFT_FLAGS = -DDEBUG diff --git a/xcode/common-release.xcconfig b/xcode/common-release.xcconfig index 980d367569..7daac23848 100644 --- a/xcode/common-release.xcconfig +++ b/xcode/common-release.xcconfig @@ -4,7 +4,7 @@ COPY_PHASE_STRIP = YES ENABLE_NS_ASSERTIONS = NO ENABLE_TESTABILITY = NO GCC_OPTIMIZATION_LEVEL = 3 -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) RELEASE _RELEASE NDEBUG HAVE_PTHREAD +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) RELEASE _RELEASE NDEBUG GCC_UNROLL_LOOPS = YES MTL_ENABLE_DEBUG_INFO = NO NS_BLOCK_ASSERTIONS = NO diff --git a/xcode/freetype/freetype.xcodeproj/project.pbxproj b/xcode/freetype/freetype.xcodeproj/project.pbxproj index 3f24c387b5..110d58b20a 100644 --- a/xcode/freetype/freetype.xcodeproj/project.pbxproj +++ b/xcode/freetype/freetype.xcodeproj/project.pbxproj @@ -1465,9 +1465,6 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", - DEBUG, - _DEBUG, - HAVE_PTHREAD, FT2_BUILD_LIBRARY, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; @@ -1486,10 +1483,6 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", - RELEASE, - _RELEASE, - NDEBUG, - HAVE_PTHREAD, FT2_BUILD_LIBRARY, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; diff --git a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj index 95d94e5571..f5f5350d90 100644 --- a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj +++ b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj @@ -233,6 +233,10 @@ baseConfigurationReference = 34F558581DBF3D2E00A4FC11 /* common-debug.xcconfig */; buildSettings = { CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + HAVE_PTHREAD, + ); GCC_WARN_INHIBIT_ALL_WARNINGS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -247,6 +251,10 @@ baseConfigurationReference = 34F558591DBF3D2E00A4FC11 /* common-release.xcconfig */; buildSettings = { CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + HAVE_PTHREAD, + ); GCC_WARN_INHIBIT_ALL_WARNINGS = YES; HEADER_SEARCH_PATHS = ( "$(inherited)",