From 6a867b16832bcbe6877c75059fc13b2ce8ff28d5 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 6 Oct 2011 13:52:57 +0300 Subject: [PATCH] [ios] Updated project file for CLANG --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 164 ++------------------- 1 file changed, 14 insertions(+), 150 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 123306c843..d34a68de2b 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -2005,7 +2005,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0410; + LastUpgradeCheck = 0420; ORGANIZATIONNAME = MapsWithMe; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Maps" */; @@ -2625,6 +2625,7 @@ 1D6058940D05DD3E006BFB54 /* Simulator Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; LIBRARY_SEARCH_PATHS = "$(inherited)"; }; name = "Simulator Debug"; @@ -2638,8 +2639,6 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1.0.1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -2650,12 +2649,7 @@ DEBUG, _DEBUG, ); - GCC_VERSION = 4.2; - HEADER_SEARCH_PATHS = ( - ../../3party/protobuf, - ../../3party/protobuf/src, - ../../3party/boost, - ); + HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = "MapsWithMe-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphonesim-debug/out/debug\""; @@ -2671,111 +2665,6 @@ }; name = "Simulator Debug"; }; - EE423F1B142E8BB100E0A701 /* Device Release Clang */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COMPRESS_PNG_FILES = NO; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.0.1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_ENABLE_PASCAL_STRINGS = NO; - GCC_FAST_MATH = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PREPROCESSOR_DEFINITIONS = ( - RELEASE, - _RELEASE, - TARGET_OS_IPHONE, - ); - GCC_THUMB_SUPPORT = NO; - "GCC_THUMB_SUPPORT[arch=armv7]" = YES; - GCC_UNROLL_LOOPS = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - ../../3party/protobuf, - ../../3party/protobuf/src, - ../../3party/boost, - ); - INFOPLIST_FILE = "MapsWithMe-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-release-clang/out/release\""; - ONLY_ACTIVE_ARCH = NO; - OTHER_CFLAGS = "-Wall"; - OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; - PRODUCT_NAME = MapsWithMe; - PROVISIONING_PROFILE = ""; - SDKROOT = iphoneos; - STRIP_INSTALLED_PRODUCT = NO; - TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "armv6 armv7"; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = "Device Release Clang"; - }; - EE423F1C142E8BB100E0A701 /* Device Release Clang */ = { - isa = XCBuildConfiguration; - buildSettings = { - LIBRARY_SEARCH_PATHS = "$(inherited)"; - }; - name = "Device Release Clang"; - }; - EE423F1D142E8BBD00E0A701 /* Device Debug Clang */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COMPRESS_PNG_FILES = NO; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.0.1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_PASCAL_STRINGS = NO; - GCC_FAST_MATH = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - DEBUG, - _DEBUG, - TARGET_OS_IPHONE, - ); - GCC_THUMB_SUPPORT = NO; - "GCC_THUMB_SUPPORT[arch=armv7]" = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - HEADER_SEARCH_PATHS = ( - ../../3party/protobuf, - ../../3party/protobuf/src, - ../../3party/boost, - ); - INFOPLIST_FILE = "MapsWithMe-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-debug-clang/out/debug\""; - ONLY_ACTIVE_ARCH = NO; - OTHER_CFLAGS = "-Wall"; - OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; - PRODUCT_NAME = MapsWithMe; - PROVISIONING_PROFILE = ""; - SDKROOT = iphoneos; - STRIP_INSTALLED_PRODUCT = NO; - TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "armv6 armv7"; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = "Device Debug Clang"; - }; - EE423F1E142E8BBD00E0A701 /* Device Debug Clang */ = { - isa = XCBuildConfiguration; - buildSettings = { - LIBRARY_SEARCH_PATHS = "$(inherited)"; - }; - name = "Device Debug Clang"; - }; FA0686DE13578E1D004CFF81 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2785,8 +2674,6 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 1.0.1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -2796,17 +2683,13 @@ OMIM_PRODUCTION, RELEASE, _RELEASE, + NDEBUG, TARGET_OS_IPHONE, ); GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; - GCC_VERSION = 4.2; - HEADER_SEARCH_PATHS = ( - ../../3party/protobuf, - ../../3party/protobuf/src, - ../../3party/boost, - ); + HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = "MapsWithMe-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/release\""; @@ -2826,6 +2709,7 @@ FA0686DF13578E1D004CFF81 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; LIBRARY_SEARCH_PATHS = "$(inherited)"; }; name = "Production Release"; @@ -2839,25 +2723,19 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1.0.1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS = ( + NDEBUG, TARGET_OS_IPHONE, RELEASE, _RELEASE, ); GCC_UNROLL_LOOPS = YES; - GCC_VERSION = 4.2; - HEADER_SEARCH_PATHS = ( - ../../3party/protobuf, - ../../3party/protobuf/src, - ../../3party/boost, - ); + HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = "MapsWithMe-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphonesim-release/out/release\""; @@ -2875,6 +2753,7 @@ FA1DE83211E2205400C6D69A /* Simulator Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; LIBRARY_SEARCH_PATHS = "$(inherited)"; }; name = "Simulator Release"; @@ -2888,8 +2767,6 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1.0.1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -2902,12 +2779,7 @@ ); GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; - GCC_VERSION = 4.2; - HEADER_SEARCH_PATHS = ( - ../../3party/protobuf, - ../../3party/protobuf/src, - ../../3party/boost, - ); + HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = "MapsWithMe-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-debug/out/debug\""; @@ -2927,6 +2799,7 @@ FA1DE85A11E2235D00C6D69A /* Device Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; LIBRARY_SEARCH_PATHS = "$(inherited)"; }; name = "Device Debug"; @@ -2940,14 +2813,13 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1.0.1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS = ( + NDEBUG, RELEASE, _RELEASE, TARGET_OS_IPHONE, @@ -2955,12 +2827,7 @@ GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; - GCC_VERSION = 4.2; - HEADER_SEARCH_PATHS = ( - ../../3party/protobuf, - ../../3party/protobuf/src, - ../../3party/boost, - ); + HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = "MapsWithMe-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-release/out/release\""; @@ -2980,6 +2847,7 @@ FA1DE85C11E2236200C6D69A /* Device Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; LIBRARY_SEARCH_PATHS = "$(inherited)"; }; name = "Device Release"; @@ -2992,10 +2860,8 @@ buildConfigurations = ( 1D6058940D05DD3E006BFB54 /* Simulator Debug */, FA1DE85A11E2235D00C6D69A /* Device Debug */, - EE423F1E142E8BBD00E0A701 /* Device Debug Clang */, FA1DE83211E2205400C6D69A /* Simulator Release */, FA1DE85C11E2236200C6D69A /* Device Release */, - EE423F1C142E8BB100E0A701 /* Device Release Clang */, FA0686DF13578E1D004CFF81 /* Production Release */, ); defaultConfigurationIsVisible = 0; @@ -3006,10 +2872,8 @@ buildConfigurations = ( C01FCF4F08A954540054247B /* Simulator Debug */, FA1DE85911E2235D00C6D69A /* Device Debug */, - EE423F1D142E8BBD00E0A701 /* Device Debug Clang */, FA1DE83111E2205400C6D69A /* Simulator Release */, FA1DE85B11E2236200C6D69A /* Device Release */, - EE423F1B142E8BB100E0A701 /* Device Release Clang */, FA0686DE13578E1D004CFF81 /* Production Release */, ); defaultConfigurationIsVisible = 0;