From 742c293e51b994a0aca5e47f1e0ad13dcb3e9e5e Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Mon, 9 Jan 2017 15:48:08 +0300 Subject: [PATCH] [search] [ios] Updated xcode projects settings. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 258 ++++++--------------- xcode/common.xcconfig | 2 - 2 files changed, 66 insertions(+), 194 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 94306eb47d..5b6bac4b5f 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -5581,18 +5581,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc dbg"; }; name = Simulator; @@ -5602,18 +5591,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc rel"; }; name = "Simulator Release"; @@ -5623,18 +5601,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc dbg"; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; }; @@ -5645,18 +5612,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc beta"; }; name = AdHoc; @@ -5666,18 +5622,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc rel"; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; }; @@ -5688,18 +5633,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc pf"; }; name = "Production Full"; @@ -5708,21 +5642,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-debug-$(CURRENT_ARCH)/out/debug", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5754,7 +5677,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm dbg"; }; name = Simulator; }; @@ -5762,21 +5685,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5808,7 +5720,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm rel"; }; name = "Simulator Release"; }; @@ -5816,21 +5728,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-debug-$(CURRENT_ARCH)/out/debug", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5862,7 +5763,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm dbg"; }; name = Debug; }; @@ -5870,21 +5771,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5916,7 +5806,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm beta"; }; name = AdHoc; }; @@ -5924,21 +5814,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5970,7 +5849,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm rel"; }; name = Release; }; @@ -5978,21 +5857,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6024,7 +5892,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm pf"; }; name = "Production Full"; }; @@ -6037,6 +5905,12 @@ BUNDLE_IDENTIFIER = mapsme.debug; DEVELOPMENT_TEAM = 3T6FSDE8C7; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6051,7 +5925,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -6079,18 +5956,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-debug-$(CURRENT_ARCH)/out/debug", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6134,6 +6003,12 @@ BUNDLE_IDENTIFIER = mapsme.debug; DEVELOPMENT_TEAM = 3T6FSDE8C7; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6145,7 +6020,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -6173,18 +6051,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-debug-$(CURRENT_ARCH)/out/debug", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6229,6 +6099,12 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = L2QFT5NA2Q; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6240,7 +6116,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "$(inherited)", @@ -6270,18 +6149,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-production-$(CURRENT_ARCH)/out/production", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6326,6 +6197,12 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = N9X2A789QT; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6337,7 +6214,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "$(inherited)", @@ -6367,18 +6247,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-production-$(CURRENT_ARCH)/out/production", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6422,6 +6294,12 @@ BUNDLE_IDENTIFIER = mapsme.release; DEVELOPMENT_TEAM = 3T6FSDE8C7; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6436,7 +6314,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -6464,18 +6345,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6519,6 +6392,12 @@ BUNDLE_IDENTIFIER = mapsme.release; DEVELOPMENT_TEAM = 3T6FSDE8C7; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6534,7 +6413,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -6562,18 +6444,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index d16023036a..0f18eb65f5 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -7,9 +7,7 @@ QT_PATH = /usr/local/opt/qt5 BOOST_ROOT = $(OMIM_ROOT)/3party/boost HEADER_SEARCH_PATHS = $(inherited) $(OMIM_ROOT) $(BOOST_ROOT) -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(QT_PATH)/lib -FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(PROJECT_DIR)/Frameworks // Deployment target IPHONEOS_DEPLOYMENT_TARGET = 8.0