diff --git a/iphone/Maps/3party/MoPubSDK/Mopub.xcodeproj/project.pbxproj b/iphone/Maps/3party/MoPubSDK/Mopub.xcodeproj/project.pbxproj index 2b8f09184b..c050887165 100644 --- a/iphone/Maps/3party/MoPubSDK/Mopub.xcodeproj/project.pbxproj +++ b/iphone/Maps/3party/MoPubSDK/Mopub.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 347D15C11F822BEB00E86251 /* FBAudienceNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F407691E9E1DA400E57AC0 /* FBAudienceNetwork.framework */; }; 34F408E51E9E1DA400E57AC0 /* FacebookBannerCustomEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F407611E9E1DA400E57AC0 /* FacebookBannerCustomEvent.m */; }; 34F408E61E9E1DA400E57AC0 /* FacebookInterstitialCustomEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F407631E9E1DA400E57AC0 /* FacebookInterstitialCustomEvent.m */; }; 34F408E71E9E1DA400E57AC0 /* FacebookNativeAdAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F407651E9E1DA400E57AC0 /* FacebookNativeAdAdapter.m */; }; @@ -563,7 +562,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 347D15C11F822BEB00E86251 /* FBAudienceNetwork.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 91dc5dc6fd..b6c8f405c2 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -674,29 +674,6 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 340D943B1E643AA700CB037A /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - 6741AA521BF340DE002C974C /* Embed App Extensions */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 13; - files = ( - ); - name = "Embed App Extensions"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 1D3623240D0F684500981E51 /* MapsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapsAppDelegate.h; sourceTree = ""; }; 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapsAppDelegate.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; @@ -3846,9 +3823,7 @@ 6741A9411BF340DE002C974C /* Resources */, 6741A9A01BF340DE002C974C /* Sources */, 6741AA311BF340DE002C974C /* Frameworks */, - 6741AA521BF340DE002C974C /* Embed App Extensions */, - 34F7422E1E08328300AC1FD6 /* Run Script */, - 340D943B1E643AA700CB037A /* Embed Frameworks */, + 34F7422E1E08328300AC1FD6 /* Crashlytics */, 34D808821E79363A002F0584 /* Copy frameworks */, ); buildRules = ( @@ -4180,14 +4155,14 @@ shellPath = /bin/sh; shellScript = "/usr/local/bin/carthage copy-frameworks"; }; - 34F7422E1E08328300AC1FD6 /* Run Script */ = { + 34F7422E1E08328300AC1FD6 /* Crashlytics */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Run Script"; + name = Crashlytics; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -4677,7 +4652,7 @@ 6741AA571BF340DE002C974C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ENABLE_BITCODE = YES; + DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/Facebook/SDK", @@ -4690,7 +4665,7 @@ 6741AA5A1BF340DE002C974C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ENABLE_BITCODE = YES; + DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/Facebook/SDK", @@ -4703,7 +4678,7 @@ 6741AA5C1BF340DE002C974C /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - ENABLE_BITCODE = YES; + DEVELOPMENT_TEAM = 3T6FSDE8C7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/Facebook/SDK", @@ -4721,7 +4696,6 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_IDENTIFIER = mapsme.debug; DEVELOPMENT_TEAM = 3T6FSDE8C7; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/3party", @@ -4771,7 +4745,6 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_IDENTIFIER = com.mapswithme.full; DEVELOPMENT_TEAM = N9X2A789QT; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/3party", @@ -4823,7 +4796,6 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_IDENTIFIER = mapsme.release; DEVELOPMENT_TEAM = 3T6FSDE8C7; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/3party", diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index 12fb9fcbba..a275fb557c 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -61,6 +61,7 @@ CLANG_ENABLE_MODULES = YES CLANG_ENABLE_OBJC_ARC = YES CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_BITCODE = YES ENABLE_STRICT_OBJC_MSGSEND = YES GCC_NO_COMMON_BLOCKS = YES GCC_PRECOMPILE_PREFIX_HEADER = YES diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index 5fd21e1334..de5660d70b 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 341EEFCD2022F9A900D5DBE4 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 341EEFCC2022F9A900D5DBE4 /* Alamofire.framework */; }; 341EEFD02022FCB000D5DBE4 /* http_uploader_apple.swift in Sources */ = {isa = PBXBuildFile; fileRef = 341EEFCF2022FCB000D5DBE4 /* http_uploader_apple.swift */; }; 34513AFA1DCB37C100471BDA /* marketing_service_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34513AF71DCB37C100471BDA /* marketing_service_ios.mm */; }; 34513AFB1DCB37C100471BDA /* marketing_service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34513AF81DCB37C100471BDA /* marketing_service.cpp */; }; @@ -237,7 +236,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 341EEFCD2022F9A900D5DBE4 /* Alamofire.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -704,30 +702,63 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F558331DBF273C00A4FC11 /* common-debug.xcconfig */; buildSettings = { - EXCLUDED_SOURCE_FILE_NAMES = ""; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = ( platform_mac.mm, secure_storage_qt.cpp, + platform_qt.cpp, ); "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = ( platform_mac.mm, secure_storage_qt.cpp, + platform_qt.cpp, ); "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = ( "ios_*", platform_ios.mm, secure_storage_ios.mm, ); - FRAMEWORK_SEARCH_PATHS = ( + "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = ( "$(inherited)", "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", ); - HEADER_SEARCH_PATHS = ( + "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = ( "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire-Swift.h", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(QT_PATH)/lib", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); + "HEADER_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers", + "$(OMIM_ROOT)/3party/jansson/src", + ); + "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers", + "$(OMIM_ROOT)/3party/jansson/src", + ); + "HEADER_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac/Alamofire.framework/Headers", "$(OMIM_ROOT)/3party/jansson/src", "$(QT_PATH)/include", ); + "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", + ); + "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", + ); + "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(QT_PATH)/lib", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); }; name = Debug; }; @@ -735,37 +766,69 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F558341DBF273C00A4FC11 /* common-release.xcconfig */; buildSettings = { - EXCLUDED_SOURCE_FILE_NAMES = ""; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = ( platform_mac.mm, secure_storage_qt.cpp, + platform_qt.cpp, ); "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = ( platform_mac.mm, secure_storage_qt.cpp, + platform_qt.cpp, ); "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = ( "ios_*", platform_ios.mm, secure_storage_ios.mm, ); - FRAMEWORK_SEARCH_PATHS = ( + "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = ( "$(inherited)", "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", ); - HEADER_SEARCH_PATHS = ( + "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = ( "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire-Swift.h", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(QT_PATH)/lib", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); + "HEADER_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers", + "$(OMIM_ROOT)/3party/jansson/src", + ); + "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers", + "$(OMIM_ROOT)/3party/jansson/src", + ); + "HEADER_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac/Alamofire.framework/Headers", "$(OMIM_ROOT)/3party/jansson/src", "$(QT_PATH)/include", ); + "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", + ); + "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", + ); + "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(QT_PATH)/lib", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); }; name = Release; }; 675343841A3F5CF500A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_MODULES = YES; EXECUTABLE_PREFIX = lib; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -776,7 +839,6 @@ 675343851A3F5CF500A0A8C3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_MODULES = YES; EXECUTABLE_PREFIX = lib; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -808,37 +870,69 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F558341DBF273C00A4FC11 /* common-release.xcconfig */; buildSettings = { - EXCLUDED_SOURCE_FILE_NAMES = ""; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = ( platform_mac.mm, secure_storage_qt.cpp, + platform_qt.cpp, ); "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = ( platform_mac.mm, secure_storage_qt.cpp, + platform_qt.cpp, ); "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = ( "ios_*", platform_ios.mm, secure_storage_ios.mm, ); - FRAMEWORK_SEARCH_PATHS = ( + "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = ( "$(inherited)", "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", ); - HEADER_SEARCH_PATHS = ( + "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = ( "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire-Swift.h", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(QT_PATH)/lib", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); + "HEADER_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers", + "$(OMIM_ROOT)/3party/jansson/src", + ); + "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers", + "$(OMIM_ROOT)/3party/jansson/src", + ); + "HEADER_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac/Alamofire.framework/Headers", "$(OMIM_ROOT)/3party/jansson/src", "$(QT_PATH)/include", ); + "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", + ); + "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", + ); + "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(QT_PATH)/lib", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); }; name = "Production Full"; }; A8E5410F1F9FBC4C00A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_MODULES = YES; EXECUTABLE_PREFIX = lib; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj index 0ed1967f0e..f15da39906 100644 --- a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj +++ b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj @@ -15,6 +15,8 @@ 348FE6851F7BBF7000AAA4AF /* libugc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 348FE6861F7BBF7000AAA4AF /* libugc.a */; }; 348FE6871F7BBF7A00AAA4AF /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 348FE6881F7BBF7A00AAA4AF /* libmwm_diff.a */; }; 348FE6891F7BBF9300AAA4AF /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 348FE68A1F7BBF9300AAA4AF /* libbsdiff.a */; }; + 34E42EEF20236EA500DF8315 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E42EEE20236EA400DF8315 /* Alamofire.framework */; }; + 34EF6F8020246E0B00838CBC /* libtransit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34EF6F8120246E0B00838CBC /* libtransit.a */; }; 34FFD3011E9CEEA20010AD12 /* helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34FFD2EF1E9CEEA20010AD12 /* helpers.cpp */; }; 34FFD3021E9CEEA20010AD12 /* map_widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34FFD2F11E9CEEA20010AD12 /* map_widget.cpp */; }; 34FFD3031E9CEEA20010AD12 /* proxy_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34FFD2F31E9CEEA20010AD12 /* proxy_style.cpp */; }; @@ -220,8 +222,10 @@ 348FE6861F7BBF7000AAA4AF /* libugc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libugc.a; sourceTree = BUILT_PRODUCTS_DIR; }; 348FE6881F7BBF7A00AAA4AF /* libmwm_diff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmwm_diff.a; sourceTree = BUILT_PRODUCTS_DIR; }; 348FE68A1F7BBF9300AAA4AF /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 34E42EEE20236EA400DF8315 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = ../../iphone/Maps/3party/Carthage/Build/Mac/Alamofire.framework; sourceTree = ""; }; 34EBB4821DBF53D8005BE9B8 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; 34EBB4831DBF53D8005BE9B8 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; + 34EF6F8120246E0B00838CBC /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 34FFD2EF1E9CEEA20010AD12 /* helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = helpers.cpp; sourceTree = ""; }; 34FFD2F01E9CEEA20010AD12 /* helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = helpers.hpp; sourceTree = ""; }; 34FFD2F11E9CEEA20010AD12 /* map_widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_widget.cpp; sourceTree = ""; }; @@ -365,6 +369,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 34EF6F8020246E0B00838CBC /* libtransit.a in Frameworks */, + 34E42EEF20236EA500DF8315 /* Alamofire.framework in Frameworks */, 348FE6891F7BBF9300AAA4AF /* libbsdiff.a in Frameworks */, 348FE6871F7BBF7A00AAA4AF /* libmwm_diff.a in Frameworks */, 348FE6851F7BBF7000AAA4AF /* libugc.a in Frameworks */, @@ -419,6 +425,8 @@ 3475E0DC1DBF5772004C7E69 /* Frameworks */ = { isa = PBXGroup; children = ( + 34EF6F8120246E0B00838CBC /* libtransit.a */, + 34E42EEE20236EA400DF8315 /* Alamofire.framework */, 348FE68A1F7BBF9300AAA4AF /* libbsdiff.a */, 348FE6881F7BBF7A00AAA4AF /* libmwm_diff.a */, 348FE6861F7BBF7000AAA4AF /* libugc.a */, @@ -654,6 +662,7 @@ 675345461A404C6100A0A8C3 /* Frameworks */, 675345471A404C6100A0A8C3 /* Resources */, 6729A5B81A692C7D007D5872 /* CopyFiles */, + 34EF6F84202471B500838CBC /* Copy frameworks */, ); buildRules = ( 671E78E11E6A45BD00B2859B /* PBXBuildRule */, @@ -678,6 +687,8 @@ TargetAttributes = { 675345481A404C6100A0A8C3 = { CreatedOnToolsVersion = 6.1; + DevelopmentTeam = 3T6FSDE8C7; + ProvisioningStyle = Automatic; }; }; }; @@ -731,6 +742,24 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 34EF6F84202471B500838CBC /* Copy frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/../../iphone/Maps/3party/Carthage/Build/Mac/Alamofire.framework", + ); + name = "Copy frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/usr/local/bin/carthage copy-frameworks"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 675345451A404C6100A0A8C3 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -785,6 +814,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34EBB4821DBF53D8005BE9B8 /* common-debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/3party/freetype/include", @@ -793,6 +831,7 @@ "$(DERIVED_FILE_DIR)", "$(OMIM_ROOT)/3party/gflags/src", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; SUPPORTED_PLATFORMS = macosx; SYMROOT = build; WARNING_CFLAGS = "-Wno-inconsistent-missing-override"; @@ -803,6 +842,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34EBB4831DBF53D8005BE9B8 /* common-release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "$(inherited)", + "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/3party/freetype/include", @@ -811,6 +859,7 @@ "$(DERIVED_FILE_DIR)", "$(OMIM_ROOT)/3party/gflags/src", ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; SUPPORTED_PLATFORMS = macosx; SYMROOT = build; WARNING_CFLAGS = "-Wno-inconsistent-missing-override"; @@ -821,11 +870,15 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = 3T6FSDE8C7; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "mail.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Debug; }; @@ -833,6 +886,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = 3T6FSDE8C7; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -844,6 +900,7 @@ INFOPLIST_FILE = Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "mail.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Release; };