diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index f4cb8ae7e7..157675f5a1 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 1DA7908820762CEB008BDD6B /* libopen_location_code.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DA7908920762CEB008BDD6B /* libopen_location_code.a */; }; 3404163C1E7BDFE000E2B6D6 /* PhotosViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404163A1E7BDFE000E2B6D6 /* PhotosViewController.swift */; }; 340416441E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340416421E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift */; }; 340416481E7BF28E00E2B6D6 /* UIView+Snapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340416461E7BF28E00E2B6D6 /* UIView+Snapshot.swift */; }; @@ -698,6 +699,8 @@ /* 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; }; + 1DA7908720762B6F008BDD6B /* libopen_location_code.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopen_location_code.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DA7908920762CEB008BDD6B /* libopen_location_code.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopen_location_code.a; sourceTree = BUILT_PRODUCTS_DIR; }; 28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.mm; sourceTree = ""; }; 3404163A1E7BDFE000E2B6D6 /* PhotosViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotosViewController.swift; sourceTree = ""; }; @@ -1734,6 +1737,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 1DA7908820762CEB008BDD6B /* libopen_location_code.a in Frameworks */, 45CBCCBA20590AAB006B55C2 /* libkml.a in Frameworks */, 349CFD0720456FEB00569949 /* GoogleMobileAds.framework in Frameworks */, 56EE14D11FE804550036F20C /* libtransit.a in Frameworks */, @@ -1898,6 +1902,8 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 1DA7908920762CEB008BDD6B /* libopen_location_code.a */, + 1DA7908720762B6F008BDD6B /* libopen_location_code.a */, 45CBCCBB20590AAB006B55C2 /* libkml.a */, 349CFD0620456FEB00569949 /* GoogleMobileAds.framework */, 56EE14D21FE804550036F20C /* libtransit.a */, diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index e28b780d72..445b98982b 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -186,6 +186,9 @@ + + diff --git a/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj b/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..4514f9e4e1 --- /dev/null +++ b/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj @@ -0,0 +1,224 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1D5F8ABC207616F000CAADFC /* codearea.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1D5F8AB8207616F000CAADFC /* codearea.cc */; }; + 1D5F8ABD207616F000CAADFC /* openlocationcode.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1D5F8AB9207616F000CAADFC /* openlocationcode.cc */; }; + 1D5F8AC1207617F200CAADFC /* codearea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D5F8ABA207616F000CAADFC /* codearea.h */; }; + 1D5F8AC2207617F200CAADFC /* openlocationcode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D5F8ABB207616F000CAADFC /* openlocationcode.h */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 1D5F8AAA207616D300CAADFC /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1D5F8AAC207616D300CAADFC /* libopen_location_code.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libopen_location_code.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D5F8AB8207616F000CAADFC /* codearea.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = codearea.cc; path = "../../../3party/open-location-code/codearea.cc"; sourceTree = ""; }; + 1D5F8AB9207616F000CAADFC /* openlocationcode.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = openlocationcode.cc; path = "../../../3party/open-location-code/openlocationcode.cc"; sourceTree = ""; }; + 1D5F8ABA207616F000CAADFC /* codearea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = codearea.h; path = "../../../3party/open-location-code/codearea.h"; sourceTree = ""; }; + 1D5F8ABB207616F000CAADFC /* openlocationcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = openlocationcode.h; path = "../../../3party/open-location-code/openlocationcode.h"; sourceTree = ""; }; + 1D5F8AC32076182E00CAADFC /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 1D5F8AC42076182E00CAADFC /* 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 */ + 1D5F8AA9207616D300CAADFC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 1D5F8AA3207616D300CAADFC = { + isa = PBXGroup; + children = ( + 1D5F8AC32076182E00CAADFC /* common-debug.xcconfig */, + 1D5F8AC42076182E00CAADFC /* common-release.xcconfig */, + 1D5F8AAE207616D300CAADFC /* open_location_code */, + 1D5F8AAD207616D300CAADFC /* Products */, + ); + sourceTree = ""; + }; + 1D5F8AAD207616D300CAADFC /* Products */ = { + isa = PBXGroup; + children = ( + 1D5F8AAC207616D300CAADFC /* libopen_location_code.a */, + ); + name = Products; + sourceTree = ""; + }; + 1D5F8AAE207616D300CAADFC /* open_location_code */ = { + isa = PBXGroup; + children = ( + 1D5F8AB8207616F000CAADFC /* codearea.cc */, + 1D5F8ABA207616F000CAADFC /* codearea.h */, + 1D5F8AB9207616F000CAADFC /* openlocationcode.cc */, + 1D5F8ABB207616F000CAADFC /* openlocationcode.h */, + ); + path = open_location_code; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 1D5F8AC0207617E900CAADFC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 1D5F8AC1207617F200CAADFC /* codearea.h in Headers */, + 1D5F8AC2207617F200CAADFC /* openlocationcode.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 1D5F8AAB207616D300CAADFC /* open_location_code */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1D5F8AB5207616D300CAADFC /* Build configuration list for PBXNativeTarget "open_location_code" */; + buildPhases = ( + 1D5F8AA8207616D300CAADFC /* Sources */, + 1D5F8AA9207616D300CAADFC /* Frameworks */, + 1D5F8AAA207616D300CAADFC /* CopyFiles */, + 1D5F8AC0207617E900CAADFC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = open_location_code; + productName = open_location_code; + productReference = 1D5F8AAC207616D300CAADFC /* libopen_location_code.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 1D5F8AA4207616D300CAADFC /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0920; + ORGANIZATIONNAME = Maps.Me; + TargetAttributes = { + 1D5F8AAB207616D300CAADFC = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 1D5F8AA7207616D300CAADFC /* Build configuration list for PBXProject "open_location_code" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 1D5F8AA3207616D300CAADFC; + productRefGroup = 1D5F8AAD207616D300CAADFC /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 1D5F8AAB207616D300CAADFC /* open_location_code */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 1D5F8AA8207616D300CAADFC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 1D5F8ABD207616F000CAADFC /* openlocationcode.cc in Sources */, + 1D5F8ABC207616F000CAADFC /* codearea.cc in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 1D5C088120764D3900EFC411 /* Production Full */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = "Production Full"; + }; + 1D5C088220764D3900EFC411 /* Production Full */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1D5F8AC42076182E00CAADFC /* common-release.xcconfig */; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = "Production Full"; + }; + 1D5F8AB3207616D300CAADFC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + 1D5F8AB4207616D300CAADFC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; + 1D5F8AB6207616D300CAADFC /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1D5F8AC32076182E00CAADFC /* common-debug.xcconfig */; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 1D5F8AB7207616D300CAADFC /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1D5F8AC42076182E00CAADFC /* common-release.xcconfig */; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1D5F8AA7207616D300CAADFC /* Build configuration list for PBXProject "open_location_code" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1D5F8AB3207616D300CAADFC /* Debug */, + 1D5F8AB4207616D300CAADFC /* Release */, + 1D5C088120764D3900EFC411 /* Production Full */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 1D5F8AB5207616D300CAADFC /* Build configuration list for PBXNativeTarget "open_location_code" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1D5F8AB6207616D300CAADFC /* Debug */, + 1D5F8AB7207616D300CAADFC /* Release */, + 1D5C088220764D3900EFC411 /* Production Full */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 1D5F8AA4207616D300CAADFC /* Project object */; +} diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index c83fdd07de..e0e76ce851 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -297,6 +297,7 @@ 0831F251200E56100034C365 /* processor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor.hpp; sourceTree = ""; }; 0831F252200E56100034C365 /* data.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = data.hpp; sourceTree = ""; }; 0831F253200E56100034C365 /* types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types.hpp; sourceTree = ""; }; + 1D4E79A92076190D006B7856 /* libopen_location_code.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopen_location_code.a; sourceTree = BUILT_PRODUCTS_DIR; }; 342D83301D5233B3000D8AEA /* hotels_classifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotels_classifier.cpp; sourceTree = ""; }; 342D83311D5233B3000D8AEA /* hotels_classifier.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = hotels_classifier.hpp; sourceTree = ""; }; 3441CE4B1CFC1D7000CF30D4 /* processor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor.cpp; sourceTree = ""; }; @@ -618,6 +619,7 @@ 34F558391DBF2E0E00A4FC11 /* Frameworks */ = { isa = PBXGroup; children = ( + 1D4E79A92076190D006B7856 /* libopen_location_code.a */, 3D0AEB041FBB102C00AD042B /* libgenerator_tests_support.a */, 3D0AEB051FBB102C00AD042B /* libindexer_tests_support.a */, 39B2B9841FB469ED00AB85A1 /* libminizip.a */,