From 97c2309a28d36af3944e284defcd9f5d271e4a67 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Wed, 5 Apr 2017 14:18:24 +0300 Subject: [PATCH] [build-fix] [ios] Fixed xc scheme build. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 4 ++++ xcode/coding/coding.xcodeproj/project.pbxproj | 4 ++-- xcode/icu/icu.xcodeproj/project.pbxproj | 16 ++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index f35d5fba3b..75aa5ee45b 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -375,6 +375,7 @@ 34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.mm */; }; 34D15BA81BD8F93C00C8BCBE /* AddSetTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34D15BA61BD8F93C00C8BCBE /* AddSetTableViewCell.mm */; }; 34D15BA91BD8F93C00C8BCBE /* AddSetTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D15BA71BD8F93C00C8BCBE /* AddSetTableViewCell.xib */; }; + 34D1B6F11E95096B0057E9C7 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D1B6F01E95096B0057E9C7 /* libicu.a */; }; 34D3AFE11E376F7E004100F9 /* UITableView+Updates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D3AFE01E376F7E004100F9 /* UITableView+Updates.swift */; }; 34D3AFE21E376F7E004100F9 /* UITableView+Updates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D3AFE01E376F7E004100F9 /* UITableView+Updates.swift */; }; 34D3AFE31E376F7E004100F9 /* UITableView+Updates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D3AFE01E376F7E004100F9 /* UITableView+Updates.swift */; }; @@ -1728,6 +1729,7 @@ 34D15BA51BD8F93C00C8BCBE /* AddSetTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSetTableViewCell.h; sourceTree = ""; }; 34D15BA61BD8F93C00C8BCBE /* AddSetTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AddSetTableViewCell.mm; sourceTree = ""; }; 34D15BA71BD8F93C00C8BCBE /* AddSetTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddSetTableViewCell.xib; sourceTree = ""; }; + 34D1B6F01E95096B0057E9C7 /* libicu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicu.a; path = "../../../omim-build/xcode/Debug/libicu.a"; sourceTree = ""; }; 34D3AFE01E376F7E004100F9 /* UITableView+Updates.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+Updates.swift"; sourceTree = ""; }; 34D3AFE81E378AF1004100F9 /* UINib+Init.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UINib+Init.swift"; sourceTree = ""; }; 34D3AFF01E37945B004100F9 /* UITableView+Cells.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+Cells.swift"; sourceTree = ""; }; @@ -2334,6 +2336,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 34D1B6F11E95096B0057E9C7 /* libicu.a in Frameworks */, 671E78D31E6A423300B2859B /* librouting_common.a in Frameworks */, 34D808861E793F91002F0584 /* Pushwoosh.framework in Frameworks */, 34D8087B1E793606002F0584 /* Alamofire.framework in Frameworks */, @@ -2513,6 +2516,7 @@ 340474DB1E08199D00C92850 /* 3party */, 3462FD8A1DC1DF3A00906FD7 /* SDK */, 3446C6761DDCA9A200146687 /* libtraffic.a */, + 34D1B6F01E95096B0057E9C7 /* libicu.a */, 34201E0B1DC0E33100D24118 /* libtracking.a */, 3DDB4BC31DAB98F000F4D021 /* libpartners_api.a */, 340DC82B1C4E72C700EAA2CC /* liboauthcpp.a */, diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 0b2bd6f652..f47f14eb3d 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -710,7 +710,7 @@ buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", - U_DISABLE_RENAMING, + "U_DISABLE_RENAMING=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -728,7 +728,7 @@ buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", - U_DISABLE_RENAMING, + "U_DISABLE_RENAMING=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)", diff --git a/xcode/icu/icu.xcodeproj/project.pbxproj b/xcode/icu/icu.xcodeproj/project.pbxproj index 2fe4691765..1b1a7dda43 100644 --- a/xcode/icu/icu.xcodeproj/project.pbxproj +++ b/xcode/icu/icu.xcodeproj/project.pbxproj @@ -2518,11 +2518,11 @@ CLANG_ENABLE_MODULES = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", - U_I18N_IMPLEMENTATION, - U_COMMON_IMPLEMENTATION, - U_STATIC_IMPLEMENTATION, + "U_I18N_IMPLEMENTATION=1", + "U_COMMON_IMPLEMENTATION=1", + "U_STATIC_IMPLEMENTATION=1", "U_CHARSET_IS_UTF8=1", - U_DISABLE_RENAMING, + "U_DISABLE_RENAMING=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -2541,11 +2541,11 @@ CLANG_ENABLE_MODULES = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", - U_I18N_IMPLEMENTATION, - U_COMMON_IMPLEMENTATION, - U_STATIC_IMPLEMENTATION, + "U_I18N_IMPLEMENTATION=1", + "U_COMMON_IMPLEMENTATION=1", + "U_STATIC_IMPLEMENTATION=1", "U_CHARSET_IS_UTF8=1", - U_DISABLE_RENAMING, + "U_DISABLE_RENAMING=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)",