[DIFFS] Fixed iOS build (#6932)

* [DIFFS] Fixed iOS build

* [diff-fix-ios-build] Config fix.

4 files changed, 439 insertions, 17 deletions

diff --git a/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj b/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..1aa89f83fb
--- /dev/null
+++ b/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj
@@ -0,0 +1,218 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		4586D0B51F4811BB00DF9CE5 /* bsdiff_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 4586D0B11F4811BB00DF9CE5 /* bsdiff_common.h */; };
+		4586D0B61F4811BB00DF9CE5 /* bsdiff_search.h in Headers */ = {isa = PBXBuildFile; fileRef = 4586D0B21F4811BB00DF9CE5 /* bsdiff_search.h */; };
+		4586D0B71F4811BB00DF9CE5 /* bsdiff.h in Headers */ = {isa = PBXBuildFile; fileRef = 4586D0B31F4811BB00DF9CE5 /* bsdiff.h */; };
+		4586D0B81F4811BB00DF9CE5 /* paged_array.h in Headers */ = {isa = PBXBuildFile; fileRef = 4586D0B41F4811BB00DF9CE5 /* paged_array.h */; };
+		4586D0BE1F4811E600DF9CE5 /* divsufsort_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4586D0B91F4811E600DF9CE5 /* divsufsort_private.h */; };
+		4586D0BF1F4811E600DF9CE5 /* divsufsort.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4586D0BA1F4811E600DF9CE5 /* divsufsort.cc */; };
+		4586D0C01F4811E600DF9CE5 /* divsufsort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4586D0BB1F4811E600DF9CE5 /* divsufsort.h */; };
+		4586D0C11F4811E600DF9CE5 /* sssort.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4586D0BC1F4811E600DF9CE5 /* sssort.cc */; };
+		4586D0C21F4811E600DF9CE5 /* trsort.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4586D0BD1F4811E600DF9CE5 /* trsort.cc */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		4586D0A11F480FE600DF9CE5 /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		4586D0AF1F4810A700DF9CE5 /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
+		4586D0B01F4810A700DF9CE5 /* common-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
+		4586D0B11F4811BB00DF9CE5 /* bsdiff_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bsdiff_common.h; path = bsdiff/bsdiff_common.h; sourceTree = "<group>"; };
+		4586D0B21F4811BB00DF9CE5 /* bsdiff_search.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bsdiff_search.h; path = bsdiff/bsdiff_search.h; sourceTree = "<group>"; };
+		4586D0B31F4811BB00DF9CE5 /* bsdiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bsdiff.h; path = bsdiff/bsdiff.h; sourceTree = "<group>"; };
+		4586D0B41F4811BB00DF9CE5 /* paged_array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = paged_array.h; path = bsdiff/paged_array.h; sourceTree = "<group>"; };
+		4586D0B91F4811E600DF9CE5 /* divsufsort_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = divsufsort_private.h; path = divsufsort/divsufsort_private.h; sourceTree = "<group>"; };
+		4586D0BA1F4811E600DF9CE5 /* divsufsort.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = divsufsort.cc; path = divsufsort/divsufsort.cc; sourceTree = "<group>"; };
+		4586D0BB1F4811E600DF9CE5 /* divsufsort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = divsufsort.h; path = divsufsort/divsufsort.h; sourceTree = "<group>"; };
+		4586D0BC1F4811E600DF9CE5 /* sssort.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sssort.cc; path = divsufsort/sssort.cc; sourceTree = "<group>"; };
+		4586D0BD1F4811E600DF9CE5 /* trsort.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = trsort.cc; path = divsufsort/trsort.cc; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		4586D09E1F480FE600DF9CE5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		4586D0981F480FE600DF9CE5 = {
+			isa = PBXGroup;
+			children = (
+				4586D0AF1F4810A700DF9CE5 /* common-debug.xcconfig */,
+				4586D0B01F4810A700DF9CE5 /* common-release.xcconfig */,
+				4586D0A31F480FE600DF9CE5 /* bsdiff */,
+				4586D0A21F480FE600DF9CE5 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		4586D0A21F480FE600DF9CE5 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				4586D0A11F480FE600DF9CE5 /* libbsdiff.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		4586D0A31F480FE600DF9CE5 /* bsdiff */ = {
+			isa = PBXGroup;
+			children = (
+				4586D0B91F4811E600DF9CE5 /* divsufsort_private.h */,
+				4586D0BA1F4811E600DF9CE5 /* divsufsort.cc */,
+				4586D0BB1F4811E600DF9CE5 /* divsufsort.h */,
+				4586D0BC1F4811E600DF9CE5 /* sssort.cc */,
+				4586D0BD1F4811E600DF9CE5 /* trsort.cc */,
+				4586D0B11F4811BB00DF9CE5 /* bsdiff_common.h */,
+				4586D0B21F4811BB00DF9CE5 /* bsdiff_search.h */,
+				4586D0B31F4811BB00DF9CE5 /* bsdiff.h */,
+				4586D0B41F4811BB00DF9CE5 /* paged_array.h */,
+			);
+			name = bsdiff;
+			path = "../../3party/bsdiff-courgette";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		4586D09F1F480FE600DF9CE5 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4586D0BE1F4811E600DF9CE5 /* divsufsort_private.h in Headers */,
+				4586D0B71F4811BB00DF9CE5 /* bsdiff.h in Headers */,
+				4586D0B61F4811BB00DF9CE5 /* bsdiff_search.h in Headers */,
+				4586D0B81F4811BB00DF9CE5 /* paged_array.h in Headers */,
+				4586D0B51F4811BB00DF9CE5 /* bsdiff_common.h in Headers */,
+				4586D0C01F4811E600DF9CE5 /* divsufsort.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		4586D0A01F480FE600DF9CE5 /* bsdiff */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4586D0AC1F480FE600DF9CE5 /* Build configuration list for PBXNativeTarget "bsdiff" */;
+			buildPhases = (
+				4586D09D1F480FE600DF9CE5 /* Sources */,
+				4586D09E1F480FE600DF9CE5 /* Frameworks */,
+				4586D09F1F480FE600DF9CE5 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = bsdiff;
+			productName = bsdiff;
+			productReference = 4586D0A11F480FE600DF9CE5 /* libbsdiff.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		4586D0991F480FE600DF9CE5 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0830;
+				ORGANIZATIONNAME = maps.me;
+				TargetAttributes = {
+					4586D0A01F480FE600DF9CE5 = {
+						CreatedOnToolsVersion = 8.3.3;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 4586D09C1F480FE600DF9CE5 /* Build configuration list for PBXProject "bsdiff" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 4586D0981F480FE600DF9CE5;
+			productRefGroup = 4586D0A21F480FE600DF9CE5 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				4586D0A01F480FE600DF9CE5 /* bsdiff */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		4586D09D1F480FE600DF9CE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4586D0BF1F4811E600DF9CE5 /* divsufsort.cc in Sources */,
+				4586D0C11F4811E600DF9CE5 /* sssort.cc in Sources */,
+				4586D0C21F4811E600DF9CE5 /* trsort.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		4586D0AA1F480FE600DF9CE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4586D0AF1F4810A700DF9CE5 /* common-debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		4586D0AB1F480FE600DF9CE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4586D0B01F4810A700DF9CE5 /* common-release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		4586D0AD1F480FE600DF9CE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		4586D0AE1F480FE600DF9CE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		4586D09C1F480FE600DF9CE5 /* Build configuration list for PBXProject "bsdiff" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4586D0AA1F480FE600DF9CE5 /* Debug */,
+				4586D0AB1F480FE600DF9CE5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4586D0AC1F480FE600DF9CE5 /* Build configuration list for PBXNativeTarget "bsdiff" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4586D0AD1F480FE600DF9CE5 /* Debug */,
+				4586D0AE1F480FE600DF9CE5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 4586D0991F480FE600DF9CE5 /* Project object */;
+}
diff --git a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..e269f61889
--- /dev/null
+++ b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj
@@ -0,0 +1,190 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		4586D0E41F48139400DF9CE5 /* diff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4586D0E21F48139400DF9CE5 /* diff.cpp */; };
+		4586D0E51F48139400DF9CE5 /* diff.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4586D0E31F48139400DF9CE5 /* diff.hpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		4586D0D21F48130600DF9CE5 /* libmwm_diff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmwm_diff.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		4586D0E01F48132A00DF9CE5 /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
+		4586D0E11F48132A00DF9CE5 /* common-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
+		4586D0E21F48139400DF9CE5 /* diff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = diff.cpp; sourceTree = "<group>"; };
+		4586D0E31F48139400DF9CE5 /* diff.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = diff.hpp; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		4586D0CF1F48130600DF9CE5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		4586D0C91F48130600DF9CE5 = {
+			isa = PBXGroup;
+			children = (
+				4586D0E01F48132A00DF9CE5 /* common-debug.xcconfig */,
+				4586D0E11F48132A00DF9CE5 /* common-release.xcconfig */,
+				4586D0D41F48130600DF9CE5 /* mwm_diff */,
+				4586D0D31F48130600DF9CE5 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		4586D0D31F48130600DF9CE5 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				4586D0D21F48130600DF9CE5 /* libmwm_diff.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		4586D0D41F48130600DF9CE5 /* mwm_diff */ = {
+			isa = PBXGroup;
+			children = (
+				4586D0E21F48139400DF9CE5 /* diff.cpp */,
+				4586D0E31F48139400DF9CE5 /* diff.hpp */,
+			);
+			name = mwm_diff;
+			path = ../../generator/mwm_diff;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		4586D0D01F48130600DF9CE5 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4586D0E51F48139400DF9CE5 /* diff.hpp in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		4586D0D11F48130600DF9CE5 /* mwm_diff */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4586D0DD1F48130600DF9CE5 /* Build configuration list for PBXNativeTarget "mwm_diff" */;
+			buildPhases = (
+				4586D0CE1F48130600DF9CE5 /* Sources */,
+				4586D0CF1F48130600DF9CE5 /* Frameworks */,
+				4586D0D01F48130600DF9CE5 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = mwm_diff;
+			productName = mwm_diff;
+			productReference = 4586D0D21F48130600DF9CE5 /* libmwm_diff.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		4586D0CA1F48130600DF9CE5 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0830;
+				ORGANIZATIONNAME = maps.me;
+				TargetAttributes = {
+					4586D0D11F48130600DF9CE5 = {
+						CreatedOnToolsVersion = 8.3.3;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 4586D0CD1F48130600DF9CE5 /* Build configuration list for PBXProject "mwm_diff" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 4586D0C91F48130600DF9CE5;
+			productRefGroup = 4586D0D31F48130600DF9CE5 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				4586D0D11F48130600DF9CE5 /* mwm_diff */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		4586D0CE1F48130600DF9CE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4586D0E41F48139400DF9CE5 /* diff.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		4586D0DB1F48130600DF9CE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4586D0E01F48132A00DF9CE5 /* common-debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		4586D0DC1F48130600DF9CE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4586D0E11F48132A00DF9CE5 /* common-release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		4586D0DE1F48130600DF9CE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		4586D0DF1F48130600DF9CE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				EXECUTABLE_PREFIX = lib;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		4586D0CD1F48130600DF9CE5 /* Build configuration list for PBXProject "mwm_diff" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4586D0DB1F48130600DF9CE5 /* Debug */,
+				4586D0DC1F48130600DF9CE5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4586D0DD1F48130600DF9CE5 /* Build configuration list for PBXNativeTarget "mwm_diff" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4586D0DE1F48130600DF9CE5 /* Debug */,
+				4586D0DF1F48130600DF9CE5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 4586D0CA1F48130600DF9CE5 /* Project object */;
+}
diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata
index 33504aa5c8..db715ff6d6 100644
--- a/xcode/omim.xcworkspace/contents.xcworkspacedata
+++ b/xcode/omim.xcworkspace/contents.xcworkspacedata
@@ -187,43 +187,46 @@
       location = "container:"
       name = "3party">
       <FileRef
-         location = "group:icu/icu.xcodeproj">
+         location = "container:agg/agg.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:agg/agg.xcodeproj">
+         location = "container:alohalitics/alohalitics.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:gflags/gflags.xcodeproj">
+         location = "container:bsdiff/bsdiff.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:jansson/jansson.xcodeproj">
+         location = "container:expat/expat.xcodeproj">
       </FileRef>
       <FileRef
          location = "container:freetype/freetype.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:osrm/osrm.xcodeproj">
+         location = "container:gflags/gflags.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:opening_hours/opening_hours.xcodeproj">
+         location = "container:icu/icu.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:succinct/succinct.xcodeproj">
+         location = "container:jansson/jansson.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:alohalitics/alohalitics.xcodeproj">
+         location = "container:minizip/minizip.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:protobuf/protobuf.xcodeproj">
+         location = "container:oauthcpp/oauthcpp.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:expat/expat.xcodeproj">
+         location = "container:opening_hours/opening_hours.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:minizip/minizip.xcodeproj">
+         location = "container:osrm/osrm.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:tess2/tess2.xcodeproj">
+         location = "container:protobuf/protobuf.xcodeproj">
+      </FileRef>
+      <FileRef
+         location = "container:pugixml/pugixml.xcodeproj">
       </FileRef>
       <FileRef
          location = "container:sdf_image/sdf_image.xcodeproj">
@@ -232,10 +235,10 @@
          location = "container:stb_image/stb_image.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:pugixml/pugixml.xcodeproj">
+         location = "container:succinct/succinct.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:oauthcpp/oauthcpp.xcodeproj">
+         location = "container:tess2/tess2.xcodeproj">
       </FileRef>
    </Group>
    <FileRef
@@ -263,13 +266,16 @@
       location = "container:generator/generator.xcodeproj">
    </FileRef>
    <FileRef
+      location = "container:mwm_diff/mwm_diff.xcodeproj">
+   </FileRef>
+   <FileRef
       location = "container:generator_tool/generator_tool.xcodeproj">
    </FileRef>
    <FileRef
       location = "container:indexer/indexer.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:local_ads/local_ads.xcodeproj">
+      location = "container:local_ads/local_ads.xcodeproj">
    </FileRef>
    <FileRef
       location = "container:map/map.xcodeproj">
@@ -308,10 +314,10 @@
       location = "container:qtMapsMe/qtMapsMe.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:ugc/ugc.xcodeproj">
+      location = "container:ugc/ugc.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:software_renderer/software_renderer.xcodeproj">
+      location = "container:software_renderer/software_renderer.xcodeproj">
    </FileRef>
    <FileRef
       location = "container:../iphone/Maps/Maps.xcodeproj">
diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj
index ebb0cd1587..68f9ed2f64 100644
--- a/xcode/storage/storage.xcodeproj/project.pbxproj
+++ b/xcode/storage/storage.xcodeproj/project.pbxproj
@@ -19,6 +19,8 @@
 		34C9BCFD1C6CCF85000DC38D /* country_name_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34C9BCFB1C6CCF85000DC38D /* country_name_getter.hpp */; };
 		401ECED41F56C50900DFDF76 /* country_parent_getter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 401ECED21F56C50900DFDF76 /* country_parent_getter.cpp */; };
 		401ECED51F56C50900DFDF76 /* country_parent_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 401ECED31F56C50900DFDF76 /* country_parent_getter.hpp */; };
+		4586D0C71F48126A00DF9CE5 /* diff_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4586D0C51F48126A00DF9CE5 /* diff_manager.cpp */; };
+		4586D0C81F48126A00DF9CE5 /* diff_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4586D0C61F48126A00DF9CE5 /* diff_manager.hpp */; };
 		56D8CB991CAC17A80003F420 /* test_defines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D8CB971CAC17A80003F420 /* test_defines.cpp */; };
 		56D8CB9A1CAC17A80003F420 /* test_defines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D8CB981CAC17A80003F420 /* test_defines.hpp */; };
 		671182CE1C7E06B400CB8177 /* storage_3levels_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */; };
@@ -190,6 +192,8 @@
 		34F5584B1DBF2FC000A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
 		401ECED21F56C50900DFDF76 /* country_parent_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_parent_getter.cpp; sourceTree = "<group>"; };
 		401ECED31F56C50900DFDF76 /* country_parent_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_parent_getter.hpp; sourceTree = "<group>"; };
+		4586D0C51F48126A00DF9CE5 /* diff_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = diff_manager.cpp; path = diff_scheme/diff_manager.cpp; sourceTree = "<group>"; };
+		4586D0C61F48126A00DF9CE5 /* diff_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = diff_manager.hpp; path = diff_scheme/diff_manager.hpp; sourceTree = "<group>"; };
 		56D8CB971CAC17A80003F420 /* test_defines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_defines.cpp; sourceTree = "<group>"; };
 		56D8CB981CAC17A80003F420 /* test_defines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_defines.hpp; sourceTree = "<group>"; };
 		671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_3levels_tests.cpp; sourceTree = "<group>"; };
@@ -516,6 +520,8 @@
 			children = (
 				401ECED21F56C50900DFDF76 /* country_parent_getter.cpp */,
 				401ECED31F56C50900DFDF76 /* country_parent_getter.hpp */,
+				4586D0C51F48126A00DF9CE5 /* diff_manager.cpp */,
+				4586D0C61F48126A00DF9CE5 /* diff_manager.hpp */,
 				F68CC5BB1F38B967007527C7 /* diff_scheme_checker.cpp */,
 				F68CC5BC1F38B967007527C7 /* diff_scheme_checker.hpp */,
 				F68CC5BD1F38B967007527C7 /* diff_types.hpp */,
@@ -607,6 +613,7 @@
 				674125221B4C05FA00A3E828 /* queued_country.hpp in Headers */,
 				6753431B1A3F5A2600A0A8C3 /* storage.hpp in Headers */,
 				67247FD61C60BA8A00EDE56A /* test_map_files_downloader.hpp in Headers */,
+				4586D0C81F48126A00DF9CE5 /* diff_manager.hpp in Headers */,
 				675343171A3F5A2600A0A8C3 /* index.hpp in Headers */,
 				34B093231C61F9BA0066F4C3 /* storage_helpers.hpp in Headers */,
 			);
@@ -776,6 +783,7 @@
 				6753430E1A3F5A2600A0A8C3 /* country.cpp in Sources */,
 				67AF4A001BC579DD0048B1ED /* country_info_getter.cpp in Sources */,
 				34B093221C61F9BA0066F4C3 /* storage_helpers.cpp in Sources */,
+				4586D0C71F48126A00DF9CE5 /* diff_manager.cpp in Sources */,
 				675343091A3F5A2600A0A8C3 /* country_decl.cpp in Sources */,
 				674125211B4C05FA00A3E828 /* queued_country.cpp in Sources */,
 				F68CC5BE1F38B967007527C7 /* diff_scheme_checker.cpp in Sources */,