From 3e71c85a46215bd54a151b45477053d5fcdb0b86 Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Mon, 19 Jun 2017 21:05:05 +0300 Subject: [PATCH] Added ugc to xcode project --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 4 + xcode/base/base.xcodeproj/project.pbxproj | 8 + .../omim.xcworkspace/contents.xcworkspacedata | 3 + xcode/ugc/ugc.xcodeproj/project.pbxproj | 198 ++++++++++++++++++ 4 files changed, 213 insertions(+) create mode 100644 xcode/ugc/ugc.xcodeproj/project.pbxproj diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index f6910424c0..8c95b89b94 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -1462,6 +1462,7 @@ F6E2FF691E097BA00083EBEC /* MWMUnitsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */; }; F6E2FF6A1E097BA00083EBEC /* MWMUnitsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */; }; F6F7787A1DABC6D800B603E7 /* MWMTaxiCollectionLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6F778791DABC6D800B603E7 /* MWMTaxiCollectionLayout.mm */; }; + F6F8E3C51EF8469700F2DE8F /* libugc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F6F8E3C41EF8469700F2DE8F /* libugc.a */; }; F6FE3C381CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */; }; F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */; }; F6FE3C3B1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6FE3C3A1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib */; }; @@ -2398,6 +2399,7 @@ F6E2FD4D1E097BA00083EBEC /* MWMUnitsController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMUnitsController.mm; sourceTree = ""; }; F6F778781DABC6D800B603E7 /* MWMTaxiCollectionLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTaxiCollectionLayout.h; sourceTree = ""; }; F6F778791DABC6D800B603E7 /* MWMTaxiCollectionLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTaxiCollectionLayout.mm; sourceTree = ""; }; + F6F8E3C41EF8469700F2DE8F /* libugc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libugc.a; path = "../../../../Library/Developer/Xcode/DerivedData/omim-fbvotunmmtqmjnezabjibwxwryev/Build/Products/Debug-iphonesimulator/libugc.a"; sourceTree = ""; }; F6FE3C361CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlaceDoesntExistAlert.h; sourceTree = ""; }; F6FE3C371CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMPlaceDoesntExistAlert.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6FE3C3A1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlaceDoesntExistAlert.xib; sourceTree = ""; }; @@ -2457,6 +2459,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + F6F8E3C51EF8469700F2DE8F /* libugc.a in Frameworks */, 34F409891E9E1DD200E57AC0 /* libMopub.a in Frameworks */, 3488B03B1E9D13EF0068AFD8 /* UserNotifications.framework in Frameworks */, 45FFD65D1E965EBE00DB854E /* liblocal_ads.a in Frameworks */, @@ -2638,6 +2641,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + F6F8E3C41EF8469700F2DE8F /* libugc.a */, 340474DB1E08199D00C92850 /* 3party */, 6741AAA21BF356B9002C974C /* libagg.a */, 6741AAA31BF356B9002C974C /* libalohalitics.a */, diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 7f3569da8e..37966e77ed 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -114,6 +114,8 @@ 67B52B601AD3C84E00664C17 /* thread_checker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67B52B5E1AD3C84E00664C17 /* thread_checker.cpp */; }; 67B52B611AD3C84E00664C17 /* thread_checker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67B52B5F1AD3C84E00664C17 /* thread_checker.hpp */; }; 67E40EC81E4DC0D500A6D200 /* small_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E40EC71E4DC0D500A6D200 /* small_set_test.cpp */; }; + F6F8E3C81EF846CE00F2DE8F /* worker_thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6F8E3C61EF846CE00F2DE8F /* worker_thread.cpp */; }; + F6F8E3C91EF846CE00F2DE8F /* worker_thread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6F8E3C71EF846CE00F2DE8F /* worker_thread.hpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -232,6 +234,8 @@ 67B52B5F1AD3C84E00664C17 /* thread_checker.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = thread_checker.hpp; sourceTree = ""; }; 67C79B9E1E2929DB00C40034 /* checked_cast.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = checked_cast.hpp; sourceTree = ""; }; 67E40EC71E4DC0D500A6D200 /* small_set_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = small_set_test.cpp; sourceTree = ""; }; + F6F8E3C61EF846CE00F2DE8F /* worker_thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worker_thread.cpp; sourceTree = ""; }; + F6F8E3C71EF846CE00F2DE8F /* worker_thread.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = worker_thread.hpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -317,6 +321,8 @@ 675341791A3F57BF00A0A8C3 /* base */ = { isa = PBXGroup; children = ( + F6F8E3C61EF846CE00F2DE8F /* worker_thread.cpp */, + F6F8E3C71EF846CE00F2DE8F /* worker_thread.hpp */, 56B1A0711E69DE4D00395022 /* random.cpp */, 56B1A0721E69DE4D00395022 /* random.hpp */, 56B1A0731E69DE4D00395022 /* small_set.hpp */, @@ -472,6 +478,7 @@ 672DD4C41E0425600078E13C /* newtype.hpp in Headers */, 672DD4C31E0425600078E13C /* mem_trie.hpp in Headers */, 672DD4C61E0425600078E13C /* range_iterator.hpp in Headers */, + F6F8E3C91EF846CE00F2DE8F /* worker_thread.hpp in Headers */, 675341FD1A3F57E400A0A8C3 /* stl_add.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -614,6 +621,7 @@ 675341F61A3F57E400A0A8C3 /* shared_buffer_manager.cpp in Sources */, 56B1A0741E69DE4D00395022 /* random.cpp in Sources */, 675341DA1A3F57E400A0A8C3 /* exception.cpp in Sources */, + F6F8E3C81EF846CE00F2DE8F /* worker_thread.cpp in Sources */, 675341F91A3F57E400A0A8C3 /* src_point.cpp in Sources */, 675342031A3F57E400A0A8C3 /* strings_bundle.cpp in Sources */, 675341CD1A3F57E400A0A8C3 /* base.cpp in Sources */, diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 778d45d9fc..51d11ecb37 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -307,6 +307,9 @@ + + diff --git a/xcode/ugc/ugc.xcodeproj/project.pbxproj b/xcode/ugc/ugc.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..7816ff5fd2 --- /dev/null +++ b/xcode/ugc/ugc.xcodeproj/project.pbxproj @@ -0,0 +1,198 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + F6150E221EF90040000B955D /* api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6150E1F1EF90040000B955D /* api.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + F6F8E3A21EF83D7600F2DE8F /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + F6150E1F1EF90040000B955D /* api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = api.cpp; sourceTree = ""; }; + F6150E201EF90040000B955D /* api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = api.hpp; sourceTree = ""; }; + F6150E211EF90040000B955D /* types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types.hpp; sourceTree = ""; }; + F6F8E3A41EF83D7600F2DE8F /* libugc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libugc.a; sourceTree = BUILT_PRODUCTS_DIR; }; + F6F8E3B81EF83DF200F2DE8F /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + F6F8E3B91EF83DF200F2DE8F /* common-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + F6F8E3A11EF83D7600F2DE8F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + F6F8E39B1EF83D7600F2DE8F = { + isa = PBXGroup; + children = ( + F6F8E3B81EF83DF200F2DE8F /* common-debug.xcconfig */, + F6F8E3B91EF83DF200F2DE8F /* common-release.xcconfig */, + F6F8E3A61EF83D7600F2DE8F /* ugc */, + F6F8E3A51EF83D7600F2DE8F /* Products */, + F6F8E3B31EF83DB600F2DE8F /* Frameworks */, + ); + sourceTree = ""; + }; + F6F8E3A51EF83D7600F2DE8F /* Products */ = { + isa = PBXGroup; + children = ( + F6F8E3A41EF83D7600F2DE8F /* libugc.a */, + ); + name = Products; + sourceTree = ""; + }; + F6F8E3A61EF83D7600F2DE8F /* ugc */ = { + isa = PBXGroup; + children = ( + F6150E1F1EF90040000B955D /* api.cpp */, + F6150E201EF90040000B955D /* api.hpp */, + F6150E211EF90040000B955D /* types.hpp */, + ); + name = ugc; + path = ../../ugc; + sourceTree = ""; + }; + F6F8E3B31EF83DB600F2DE8F /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + F6F8E3A31EF83D7600F2DE8F /* ugc */ = { + isa = PBXNativeTarget; + buildConfigurationList = F6F8E3AD1EF83D7600F2DE8F /* Build configuration list for PBXNativeTarget "ugc" */; + buildPhases = ( + F6F8E3A01EF83D7600F2DE8F /* Sources */, + F6F8E3A11EF83D7600F2DE8F /* Frameworks */, + F6F8E3A21EF83D7600F2DE8F /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = ugc; + productName = ugc; + productReference = F6F8E3A41EF83D7600F2DE8F /* libugc.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + F6F8E39C1EF83D7600F2DE8F /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0830; + ORGANIZATIONNAME = v.mikhaylenko; + TargetAttributes = { + F6F8E3A31EF83D7600F2DE8F = { + CreatedOnToolsVersion = 8.3.3; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = F6F8E39F1EF83D7600F2DE8F /* Build configuration list for PBXProject "ugc" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = F6F8E39B1EF83D7600F2DE8F; + productRefGroup = F6F8E3A51EF83D7600F2DE8F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + F6F8E3A31EF83D7600F2DE8F /* ugc */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + F6F8E3A01EF83D7600F2DE8F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F6150E221EF90040000B955D /* api.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + F6F8E3AB1EF83D7600F2DE8F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + F6F8E3AC1EF83D7600F2DE8F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; + F6F8E3AE1EF83D7600F2DE8F /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = F6F8E3B81EF83DF200F2DE8F /* common-debug.xcconfig */; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + F6F8E3AF1EF83D7600F2DE8F /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = F6F8E3B91EF83DF200F2DE8F /* common-release.xcconfig */; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + F6F8E39F1EF83D7600F2DE8F /* Build configuration list for PBXProject "ugc" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F6F8E3AB1EF83D7600F2DE8F /* Debug */, + F6F8E3AC1EF83D7600F2DE8F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F6F8E3AD1EF83D7600F2DE8F /* Build configuration list for PBXNativeTarget "ugc" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F6F8E3AE1EF83D7600F2DE8F /* Debug */, + F6F8E3AF1EF83D7600F2DE8F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = F6F8E39C1EF83D7600F2DE8F /* Project object */; +}