From 6a643b51edb05ea0b7eab0b83d3589eb49876e2e Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Wed, 16 Nov 2016 17:55:22 +0300 Subject: [PATCH] [MAPSME-2976] [ios] Fixed xc scheme build. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 4 +++ xcode/base/base.xcodeproj/project.pbxproj | 36 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 348f542eda..c4bcf0dc60 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -121,6 +121,7 @@ 3442B29D1D92C14C00CA9291 /* MWMMapDownloaderAdsTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3442B29B1D92C14C00CA9291 /* MWMMapDownloaderAdsTableViewCell.mm */; }; 3442B29F1D92C56500CA9291 /* MWMMapDownloaderAdsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3442B29E1D92C56500CA9291 /* MWMMapDownloaderAdsTableViewCell.xib */; }; 3442B2A01D92C56500CA9291 /* MWMMapDownloaderAdsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3442B29E1D92C56500CA9291 /* MWMMapDownloaderAdsTableViewCell.xib */; }; + 3446C6771DDCA9A200146687 /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3446C6761DDCA9A200146687 /* libtraffic.a */; }; 34479C7C1C60C6130065D261 /* MWMFrameworkListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34479C781C60C6130065D261 /* MWMFrameworkListener.mm */; }; 34479C7D1C60C6130065D261 /* MWMFrameworkListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34479C781C60C6130065D261 /* MWMFrameworkListener.mm */; }; 344D77B41D1BD7C800DBED70 /* MWMLocationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 344D77B31D1BD7C800DBED70 /* MWMLocationManager.mm */; }; @@ -1090,6 +1091,7 @@ 3442B29A1D92C14C00CA9291 /* MWMMapDownloaderAdsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloaderAdsTableViewCell.h; sourceTree = ""; }; 3442B29B1D92C14C00CA9291 /* MWMMapDownloaderAdsTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloaderAdsTableViewCell.mm; sourceTree = ""; }; 3442B29E1D92C56500CA9291 /* MWMMapDownloaderAdsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMMapDownloaderAdsTableViewCell.xib; sourceTree = ""; }; + 3446C6761DDCA9A200146687 /* libtraffic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtraffic.a; path = "../../../omim-build/xcode/Debug/libtraffic.a"; sourceTree = ""; }; 34479C751C60C6130065D261 /* Framework.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Framework.cpp; sourceTree = ""; }; 34479C761C60C6130065D261 /* Framework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Framework.h; sourceTree = ""; }; 34479C771C60C6130065D261 /* MWMFrameworkListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkListener.h; sourceTree = ""; }; @@ -1822,6 +1824,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3446C6771DDCA9A200146687 /* libtraffic.a in Frameworks */, 34201E0C1DC0E33100D24118 /* libtracking.a in Frameworks */, 34170B7E1D93C3C80074117B /* MyTargetSDK.framework in Frameworks */, 34BF68631D7459E6001752F6 /* CoreSpotlight.framework in Frameworks */, @@ -2005,6 +2008,7 @@ children = ( 3462FD8B1DC1DFDE00906FD7 /* 3party */, 3462FD8A1DC1DF3A00906FD7 /* SDK */, + 3446C6761DDCA9A200146687 /* libtraffic.a */, 34201E0B1DC0E33100D24118 /* libtracking.a */, 3DDB4BC31DAB98F000F4D021 /* libpartners_api.a */, 340DC82B1C4E72C700EAA2CC /* liboauthcpp.a */, diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 56c490e2e4..2a60784ebc 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -7,6 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 3446C6711DDCA96300146687 /* dfa_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3446C66C1DDCA96300146687 /* dfa_helpers.hpp */; }; + 3446C6721DDCA96300146687 /* levenshtein_dfa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3446C66D1DDCA96300146687 /* levenshtein_dfa.cpp */; }; + 3446C6731DDCA96300146687 /* levenshtein_dfa.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3446C66E1DDCA96300146687 /* levenshtein_dfa.hpp */; }; + 3446C6741DDCA96300146687 /* uni_string_dfa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3446C66F1DDCA96300146687 /* uni_string_dfa.cpp */; }; + 3446C6751DDCA96300146687 /* uni_string_dfa.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3446C6701DDCA96300146687 /* uni_string_dfa.hpp */; }; + 3446C67C1DDCAA4600146687 /* levenshtein_dfa_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3446C6781DDCAA2500146687 /* levenshtein_dfa_test.cpp */; }; + 3446C67D1DDCAA4900146687 /* uni_string_dfa_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3446C6791DDCAA2500146687 /* uni_string_dfa_test.cpp */; }; + 3446C6821DDCAA7400146687 /* newtype_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3446C67E1DDCAA6E00146687 /* newtype_test.cpp */; }; + 3446C6831DDCAA7800146687 /* ref_counted_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3446C67F1DDCAA6E00146687 /* ref_counted_tests.cpp */; }; 39FD271E1CC65AD000AFF551 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD27011CC65A2800AFF551 /* testingmain.cpp */; }; 39FD271F1CC65AD000AFF551 /* assert_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26C81CC65A0E00AFF551 /* assert_test.cpp */; }; 39FD27201CC65AD000AFF551 /* bits_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26CA1CC65A0E00AFF551 /* bits_test.cpp */; }; @@ -106,6 +115,15 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 3446C66C1DDCA96300146687 /* dfa_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = dfa_helpers.hpp; sourceTree = ""; }; + 3446C66D1DDCA96300146687 /* levenshtein_dfa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = levenshtein_dfa.cpp; sourceTree = ""; }; + 3446C66E1DDCA96300146687 /* levenshtein_dfa.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = levenshtein_dfa.hpp; sourceTree = ""; }; + 3446C66F1DDCA96300146687 /* uni_string_dfa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uni_string_dfa.cpp; sourceTree = ""; }; + 3446C6701DDCA96300146687 /* uni_string_dfa.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = uni_string_dfa.hpp; sourceTree = ""; }; + 3446C6781DDCAA2500146687 /* levenshtein_dfa_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = levenshtein_dfa_test.cpp; sourceTree = ""; }; + 3446C6791DDCAA2500146687 /* uni_string_dfa_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uni_string_dfa_test.cpp; sourceTree = ""; }; + 3446C67E1DDCAA6E00146687 /* newtype_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = newtype_test.cpp; sourceTree = ""; }; + 3446C67F1DDCAA6E00146687 /* ref_counted_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ref_counted_tests.cpp; sourceTree = ""; }; 34BA2D6A1DBE169E00FAB345 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 39FD26C81CC65A0E00AFF551 /* assert_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = assert_test.cpp; sourceTree = ""; }; @@ -234,6 +252,10 @@ 39FD26C71CC659D200AFF551 /* base_tests */ = { isa = PBXGroup; children = ( + 3446C67E1DDCAA6E00146687 /* newtype_test.cpp */, + 3446C67F1DDCAA6E00146687 /* ref_counted_tests.cpp */, + 3446C6781DDCAA2500146687 /* levenshtein_dfa_test.cpp */, + 3446C6791DDCAA2500146687 /* uni_string_dfa_test.cpp */, 39FD27011CC65A2800AFF551 /* testingmain.cpp */, 39FD26C81CC65A0E00AFF551 /* assert_test.cpp */, 39FD26CA1CC65A0E00AFF551 /* bits_test.cpp */, @@ -292,6 +314,11 @@ 675341791A3F57BF00A0A8C3 /* base */ = { isa = PBXGroup; children = ( + 3446C66C1DDCA96300146687 /* dfa_helpers.hpp */, + 3446C66D1DDCA96300146687 /* levenshtein_dfa.cpp */, + 3446C66E1DDCA96300146687 /* levenshtein_dfa.hpp */, + 3446C66F1DDCA96300146687 /* uni_string_dfa.cpp */, + 3446C6701DDCA96300146687 /* uni_string_dfa.hpp */, 671182EE1C807C0A00CB8177 /* gmtime.cpp */, 671182EF1C807C0A00CB8177 /* gmtime.hpp */, 670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */, @@ -394,6 +421,7 @@ 675341E61A3F57E400A0A8C3 /* mutex.hpp in Headers */, 675341D11A3F57E400A0A8C3 /* cache.hpp in Headers */, 675341E31A3F57E400A0A8C3 /* math.hpp in Headers */, + 3446C6731DDCA96300146687 /* levenshtein_dfa.hpp in Headers */, 675341E21A3F57E400A0A8C3 /* macros.hpp in Headers */, 6753420D1A3F57E400A0A8C3 /* threaded_priority_queue.hpp in Headers */, 675341EF1A3F57E400A0A8C3 /* rolling_hash.hpp in Headers */, @@ -410,6 +438,7 @@ 675342001A3F57E400A0A8C3 /* string_format.hpp in Headers */, 675341F41A3F57E400A0A8C3 /* scope_guard.hpp in Headers */, 675342071A3F57E400A0A8C3 /* thread_pool.hpp in Headers */, + 3446C6711DDCA96300146687 /* dfa_helpers.hpp in Headers */, 6753420C1A3F57E400A0A8C3 /* threaded_list.hpp in Headers */, 675341DB1A3F57E400A0A8C3 /* exception.hpp in Headers */, 6753453E1A3F6F6A00A0A8C3 /* message.hpp in Headers */, @@ -429,6 +458,7 @@ 675341F71A3F57E400A0A8C3 /* shared_buffer_manager.hpp in Headers */, 67B52B611AD3C84E00664C17 /* thread_checker.hpp in Headers */, 675341CB1A3F57E400A0A8C3 /* array_adapters.hpp in Headers */, + 3446C6751DDCA96300146687 /* uni_string_dfa.hpp in Headers */, 6753420B1A3F57E400A0A8C3 /* threaded_container.hpp in Headers */, 675342051A3F57E400A0A8C3 /* swap.hpp in Headers */, 675341FD1A3F57E400A0A8C3 /* stl_add.hpp in Headers */, @@ -529,11 +559,14 @@ 39FD271E1CC65AD000AFF551 /* testingmain.cpp in Sources */, 39FD27391CC65AD000AFF551 /* timer_test.cpp in Sources */, 39FD27201CC65AD000AFF551 /* bits_test.cpp in Sources */, + 3446C67D1DDCAA4900146687 /* uni_string_dfa_test.cpp in Sources */, 39FD27321CC65AD000AFF551 /* string_format_test.cpp in Sources */, 39FD272A1CC65AD000AFF551 /* mem_trie_test.cpp in Sources */, + 3446C67C1DDCAA4600146687 /* levenshtein_dfa_test.cpp in Sources */, 39FD27381CC65AD000AFF551 /* timegm_test.cpp in Sources */, 39FD272C1CC65AD000AFF551 /* range_iterator_test.cpp in Sources */, 39FD27261CC65AD000AFF551 /* containers_test.cpp in Sources */, + 3446C6821DDCAA7400146687 /* newtype_test.cpp in Sources */, 39FD27231CC65AD000AFF551 /* collection_cast_test.cpp in Sources */, 39FD27301CC65AD000AFF551 /* stl_add_test.cpp in Sources */, 39FD272E1CC65AD000AFF551 /* rolling_hash_test.cpp in Sources */, @@ -543,6 +576,7 @@ 39FD273A1CC65AD000AFF551 /* worker_thread_test.cpp in Sources */, 39FD27331CC65AD000AFF551 /* string_utils_test.cpp in Sources */, 39FD27311CC65AD000AFF551 /* stl_helpers_test.cpp in Sources */, + 3446C6831DDCAA7800146687 /* ref_counted_tests.cpp in Sources */, 39FD27211CC65AD000AFF551 /* buffer_vector_test.cpp in Sources */, 39FD27241CC65AD000AFF551 /* condition_test.cpp in Sources */, 39FD27221CC65AD000AFF551 /* cache_test.cpp in Sources */, @@ -561,6 +595,8 @@ buildActionMask = 2147483647; files = ( 675341D61A3F57E400A0A8C3 /* condition_windows_native.cpp in Sources */, + 3446C6741DDCA96300146687 /* uni_string_dfa.cpp in Sources */, + 3446C6721DDCA96300146687 /* levenshtein_dfa.cpp in Sources */, 6753453D1A3F6F6A00A0A8C3 /* message.cpp in Sources */, 675342081A3F57E400A0A8C3 /* thread.cpp in Sources */, 675342061A3F57E400A0A8C3 /* thread_pool.cpp in Sources */,