Fix Xcode build

7 files changed, 25 insertions, 260 deletions

diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj
index 6140414bb4..d1a4b06f30 100644
--- a/xcode/base/base.xcodeproj/project.pbxproj
+++ b/xcode/base/base.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		674A28AD1B160437001A525C /* deferred_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A28AB1B160437001A525C /* deferred_task.cpp */; };
+		674A28AE1B160437001A525C /* deferred_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674A28AC1B160437001A525C /* deferred_task.hpp */; };
 		675341CB1A3F57E400A0A8C3 /* array_adapters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341851A3F57E400A0A8C3 /* array_adapters.hpp */; };
 		675341CC1A3F57E400A0A8C3 /* assert.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341861A3F57E400A0A8C3 /* assert.hpp */; };
 		675341CD1A3F57E400A0A8C3 /* base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341871A3F57E400A0A8C3 /* base.cpp */; };
@@ -45,8 +47,6 @@
 		675341EF1A3F57E400A0A8C3 /* rolling_hash.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341AA1A3F57E400A0A8C3 /* rolling_hash.hpp */; };
 		675341F01A3F57E400A0A8C3 /* runner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341AB1A3F57E400A0A8C3 /* runner.cpp */; };
 		675341F11A3F57E400A0A8C3 /* runner.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341AC1A3F57E400A0A8C3 /* runner.hpp */; };
-		675341F21A3F57E400A0A8C3 /* scheduled_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341AD1A3F57E400A0A8C3 /* scheduled_task.cpp */; };
-		675341F31A3F57E400A0A8C3 /* scheduled_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341AE1A3F57E400A0A8C3 /* scheduled_task.hpp */; };
 		675341F41A3F57E400A0A8C3 /* scope_guard.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341AF1A3F57E400A0A8C3 /* scope_guard.hpp */; };
 		675341F51A3F57E400A0A8C3 /* set_operations.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341B01A3F57E400A0A8C3 /* set_operations.hpp */; };
 		675341F61A3F57E400A0A8C3 /* shared_buffer_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341B11A3F57E400A0A8C3 /* shared_buffer_manager.cpp */; };
@@ -83,6 +83,8 @@
 
 /* Begin PBXFileReference section */
 		670D05AA1B0E057B0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
+		674A28AB1B160437001A525C /* deferred_task.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deferred_task.cpp; sourceTree = "<group>"; };
+		674A28AC1B160437001A525C /* deferred_task.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = deferred_task.hpp; sourceTree = "<group>"; };
 		675341771A3F57BF00A0A8C3 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		675341851A3F57E400A0A8C3 /* array_adapters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = array_adapters.hpp; sourceTree = "<group>"; };
 		675341861A3F57E400A0A8C3 /* assert.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = assert.hpp; sourceTree = "<group>"; };
@@ -122,8 +124,6 @@
 		675341AA1A3F57E400A0A8C3 /* rolling_hash.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rolling_hash.hpp; sourceTree = "<group>"; };
 		675341AB1A3F57E400A0A8C3 /* runner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = runner.cpp; sourceTree = "<group>"; };
 		675341AC1A3F57E400A0A8C3 /* runner.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = runner.hpp; sourceTree = "<group>"; };
-		675341AD1A3F57E400A0A8C3 /* scheduled_task.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scheduled_task.cpp; sourceTree = "<group>"; };
-		675341AE1A3F57E400A0A8C3 /* scheduled_task.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = scheduled_task.hpp; sourceTree = "<group>"; };
 		675341AF1A3F57E400A0A8C3 /* scope_guard.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = scope_guard.hpp; sourceTree = "<group>"; };
 		675341B01A3F57E400A0A8C3 /* set_operations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = set_operations.hpp; sourceTree = "<group>"; };
 		675341B11A3F57E400A0A8C3 /* shared_buffer_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shared_buffer_manager.cpp; sourceTree = "<group>"; };
@@ -189,9 +189,11 @@
 		675341791A3F57BF00A0A8C3 /* base */ = {
 			isa = PBXGroup;
 			children = (
+				675345381A3F6F5E00A0A8C3 /* internal */,
+				674A28AB1B160437001A525C /* deferred_task.cpp */,
+				674A28AC1B160437001A525C /* deferred_task.hpp */,
 				67B52B5E1AD3C84E00664C17 /* thread_checker.cpp */,
 				67B52B5F1AD3C84E00664C17 /* thread_checker.hpp */,
-				675345381A3F6F5E00A0A8C3 /* internal */,
 				675341851A3F57E400A0A8C3 /* array_adapters.hpp */,
 				675341861A3F57E400A0A8C3 /* assert.hpp */,
 				675341871A3F57E400A0A8C3 /* base.cpp */,
@@ -230,8 +232,6 @@
 				675341AA1A3F57E400A0A8C3 /* rolling_hash.hpp */,
 				675341AB1A3F57E400A0A8C3 /* runner.cpp */,
 				675341AC1A3F57E400A0A8C3 /* runner.hpp */,
-				675341AD1A3F57E400A0A8C3 /* scheduled_task.cpp */,
-				675341AE1A3F57E400A0A8C3 /* scheduled_task.hpp */,
 				675341AF1A3F57E400A0A8C3 /* scope_guard.hpp */,
 				675341B01A3F57E400A0A8C3 /* set_operations.hpp */,
 				675341B11A3F57E400A0A8C3 /* shared_buffer_manager.cpp */,
@@ -294,7 +294,6 @@
 				675342021A3F57E400A0A8C3 /* string_utils.hpp in Headers */,
 				675341E41A3F57E400A0A8C3 /* matrix.hpp in Headers */,
 				675341D81A3F57E400A0A8C3 /* condition.hpp in Headers */,
-				675341F31A3F57E400A0A8C3 /* scheduled_task.hpp in Headers */,
 				675341E51A3F57E400A0A8C3 /* mru_cache.hpp in Headers */,
 				675341E91A3F57E400A0A8C3 /* object_tracker.hpp in Headers */,
 				675341F51A3F57E400A0A8C3 /* set_operations.hpp in Headers */,
@@ -310,6 +309,7 @@
 				675341D01A3F57E400A0A8C3 /* buffer_vector.hpp in Headers */,
 				675341FC1A3F57E400A0A8C3 /* std_serialization.hpp in Headers */,
 				675342091A3F57E400A0A8C3 /* thread.hpp in Headers */,
+				674A28AE1B160437001A525C /* deferred_task.hpp in Headers */,
 				675341CC1A3F57E400A0A8C3 /* assert.hpp in Headers */,
 				675341E01A3F57E400A0A8C3 /* logging.hpp in Headers */,
 				675341F11A3F57E400A0A8C3 /* runner.hpp in Headers */,
@@ -387,6 +387,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				675341D61A3F57E400A0A8C3 /* condition_windows_native.cpp in Sources */,
+				674A28AD1B160437001A525C /* deferred_task.cpp in Sources */,
 				6753453D1A3F6F6A00A0A8C3 /* message.cpp in Sources */,
 				675342081A3F57E400A0A8C3 /* thread.cpp in Sources */,
 				675342061A3F57E400A0A8C3 /* thread_pool.cpp in Sources */,
@@ -395,7 +396,6 @@
 				675341D41A3F57E400A0A8C3 /* condition_bada.cpp in Sources */,
 				6753420E1A3F57E400A0A8C3 /* timer.cpp in Sources */,
 				675341EA1A3F57E400A0A8C3 /* pseudo_random.cpp in Sources */,
-				675341F21A3F57E400A0A8C3 /* scheduled_task.cpp in Sources */,
 				675341F61A3F57E400A0A8C3 /* shared_buffer_manager.cpp in Sources */,
 				675341DA1A3F57E400A0A8C3 /* exception.cpp in Sources */,
 				675341F91A3F57E400A0A8C3 /* src_point.cpp in Sources */,
diff --git a/xcode/expat/expat.xcodeproj/project.pbxproj b/xcode/expat/expat.xcodeproj/project.pbxproj
index 2eaba7ccef..4ac302aaca 100644
--- a/xcode/expat/expat.xcodeproj/project.pbxproj
+++ b/xcode/expat/expat.xcodeproj/project.pbxproj
@@ -175,6 +175,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -214,6 +215,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_MEMMOVE;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -236,6 +238,7 @@
 					HAVE_MEMMOVE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -249,6 +252,7 @@
 				GCC_ENABLE_CPP_RTTI = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_MEMMOVE;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
diff --git a/xcode/gflags/gflags.xcodeproj/project.pbxproj b/xcode/gflags/gflags.xcodeproj/project.pbxproj
index 4c50127057..3d696d988b 100644
--- a/xcode/gflags/gflags.xcodeproj/project.pbxproj
+++ b/xcode/gflags/gflags.xcodeproj/project.pbxproj
@@ -230,6 +230,7 @@
 				GCC_ENABLE_CPP_EXCEPTIONS = YES;
 				GCC_ENABLE_CPP_RTTI = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -243,6 +244,7 @@
 				GCC_ENABLE_CPP_EXCEPTIONS = YES;
 				GCC_ENABLE_CPP_RTTI = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
diff --git a/xcode/o5mreader/o5mreader.xcodeproj/project.pbxproj b/xcode/o5mreader/o5mreader.xcodeproj/project.pbxproj
deleted file mode 100644
index 0bb0458a58..0000000000
--- a/xcode/o5mreader/o5mreader.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,248 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		670B84B21A8A7A6700CE4492 /* o5mreader.c in Sources */ = {isa = PBXBuildFile; fileRef = 670B84B01A8A7A6700CE4492 /* o5mreader.c */; };
-		670B84B31A8A7A6700CE4492 /* o5mreader.h in Headers */ = {isa = PBXBuildFile; fileRef = 670B84B11A8A7A6700CE4492 /* o5mreader.h */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		670B84A91A8A7A4D00CE4492 /* libo5mreader.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libo5mreader.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		670B84B01A8A7A6700CE4492 /* o5mreader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = o5mreader.c; path = ../../3party/o5mreader/o5mreader.c; sourceTree = "<group>"; };
-		670B84B11A8A7A6700CE4492 /* o5mreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = o5mreader.h; path = ../../3party/o5mreader/o5mreader.h; sourceTree = "<group>"; };
-		670D05B61B0E0BFC0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		670B84A61A8A7A4D00CE4492 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		670B84A01A8A7A4D00CE4492 = {
-			isa = PBXGroup;
-			children = (
-				670D05B61B0E0BFC0013A7AC /* defaults.xcconfig */,
-				670B84B01A8A7A6700CE4492 /* o5mreader.c */,
-				670B84B11A8A7A6700CE4492 /* o5mreader.h */,
-				670B84AA1A8A7A4D00CE4492 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		670B84AA1A8A7A4D00CE4492 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				670B84A91A8A7A4D00CE4492 /* libo5mreader.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		670B84A71A8A7A4D00CE4492 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				670B84B31A8A7A6700CE4492 /* o5mreader.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		670B84A81A8A7A4D00CE4492 /* o5mreader */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 670B84AD1A8A7A4D00CE4492 /* Build configuration list for PBXNativeTarget "o5mreader" */;
-			buildPhases = (
-				670B84A51A8A7A4D00CE4492 /* Sources */,
-				670B84A61A8A7A4D00CE4492 /* Frameworks */,
-				670B84A71A8A7A4D00CE4492 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = o5mreader;
-			productName = o5mreader;
-			productReference = 670B84A91A8A7A4D00CE4492 /* libo5mreader.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		670B84A11A8A7A4D00CE4492 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0630;
-				ORGANIZATIONNAME = maps.me;
-				TargetAttributes = {
-					670B84A81A8A7A4D00CE4492 = {
-						CreatedOnToolsVersion = 6.1.1;
-					};
-				};
-			};
-			buildConfigurationList = 670B84A41A8A7A4D00CE4492 /* Build configuration list for PBXProject "o5mreader" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 670B84A01A8A7A4D00CE4492;
-			productRefGroup = 670B84AA1A8A7A4D00CE4492 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				670B84A81A8A7A4D00CE4492 /* o5mreader */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		670B84A51A8A7A4D00CE4492 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				670B84B21A8A7A6700CE4492 /* o5mreader.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		670B84AB1A8A7A4D00CE4492 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 670D05B61B0E0BFC0013A7AC /* defaults.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		670B84AC1A8A7A4D00CE4492 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 670D05B61B0E0BFC0013A7AC /* defaults.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		670B84AE1A8A7A4D00CE4492 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COMBINE_HIDPI_IMAGES = YES;
-				EXECUTABLE_PREFIX = lib;
-				GCC_C_LANGUAGE_STANDARD = gnu89;
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		670B84AF1A8A7A4D00CE4492 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COMBINE_HIDPI_IMAGES = YES;
-				EXECUTABLE_PREFIX = lib;
-				GCC_C_LANGUAGE_STANDARD = gnu89;
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		670B84A41A8A7A4D00CE4492 /* Build configuration list for PBXProject "o5mreader" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				670B84AB1A8A7A4D00CE4492 /* Debug */,
-				670B84AC1A8A7A4D00CE4492 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		670B84AD1A8A7A4D00CE4492 /* Build configuration list for PBXNativeTarget "o5mreader" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				670B84AE1A8A7A4D00CE4492 /* Debug */,
-				670B84AF1A8A7A4D00CE4492 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 670B84A11A8A7A4D00CE4492 /* Project object */;
-}
diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata
index 34ffb26d55..960fb8cf71 100644
--- a/xcode/omim.xcworkspace/contents.xcworkspacedata
+++ b/xcode/omim.xcworkspace/contents.xcworkspacedata
@@ -32,9 +32,6 @@
          location = "container:osrm/osrm.xcodeproj">
       </FileRef>
       <FileRef
-         location = "container:o5mreader/o5mreader.xcodeproj">
-      </FileRef>
-      <FileRef
          location = "container:opening_hours/opening_hours.xcodeproj">
       </FileRef>
       <FileRef
diff --git a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj
index 0cca9ad201..ac02f80cc9 100644
--- a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj
+++ b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj
@@ -194,6 +194,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
@@ -236,6 +237,7 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj
index 5294385bf4..0799c07c39 100644
--- a/xcode/routing/routing.xcodeproj/project.pbxproj
+++ b/xcode/routing/routing.xcodeproj/project.pbxproj
@@ -13,6 +13,8 @@
 		670C62141AC5A15700C38A8C /* routing_mapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 670C62121AC5A15700C38A8C /* routing_mapping.h */; };
 		670D049E1B0B4A970013A7AC /* nearest_edge_finder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */; };
 		670D049F1B0B4A970013A7AC /* nearest_edge_finder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670D049D1B0B4A970013A7AC /* nearest_edge_finder.hpp */; };
+		674A28B11B1605D2001A525C /* osrm_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A28AF1B1605D2001A525C /* osrm_engine.cpp */; };
+		674A28B21B1605D2001A525C /* osrm_engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674A28B01B1605D2001A525C /* osrm_engine.hpp */; };
 		674F9BC81B0A580E00704FFA /* astar_router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674F9BB81B0A580E00704FFA /* astar_router.cpp */; };
 		674F9BC91B0A580E00704FFA /* astar_router.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674F9BB91B0A580E00704FFA /* astar_router.hpp */; };
 		674F9BCA1B0A580E00704FFA /* async_router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674F9BBA1B0A580E00704FFA /* async_router.cpp */; };
@@ -51,6 +53,8 @@
 		670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nearest_edge_finder.cpp; sourceTree = "<group>"; };
 		670D049D1B0B4A970013A7AC /* nearest_edge_finder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = nearest_edge_finder.hpp; sourceTree = "<group>"; };
 		670D05A61B0E02560013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
+		674A28AF1B1605D2001A525C /* osrm_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osrm_engine.cpp; sourceTree = "<group>"; };
+		674A28B01B1605D2001A525C /* osrm_engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osrm_engine.hpp; sourceTree = "<group>"; };
 		674F9BB81B0A580E00704FFA /* astar_router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = astar_router.cpp; sourceTree = "<group>"; };
 		674F9BB91B0A580E00704FFA /* astar_router.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = astar_router.hpp; sourceTree = "<group>"; };
 		674F9BBA1B0A580E00704FFA /* async_router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = async_router.cpp; sourceTree = "<group>"; };
@@ -113,6 +117,8 @@
 		675343FA1A3F640D00A0A8C3 /* routing */ = {
 			isa = PBXGroup;
 			children = (
+				674A28AF1B1605D2001A525C /* osrm_engine.cpp */,
+				674A28B01B1605D2001A525C /* osrm_engine.hpp */,
 				670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */,
 				670D049D1B0B4A970013A7AC /* nearest_edge_finder.hpp */,
 				674F9BB81B0A580E00704FFA /* astar_router.cpp */,
@@ -161,6 +167,7 @@
 			files = (
 				674F9BCB1B0A580E00704FFA /* async_router.hpp in Headers */,
 				674F9BD11B0A580E00704FFA /* online_cross_fetcher.hpp in Headers */,
+				674A28B21B1605D2001A525C /* osrm_engine.hpp in Headers */,
 				674F9BD31B0A580E00704FFA /* road_graph_router.hpp in Headers */,
 				675344181A3F644F00A0A8C3 /* osrm_router.hpp in Headers */,
 				675344141A3F644F00A0A8C3 /* osrm_data_facade.hpp in Headers */,
@@ -245,6 +252,7 @@
 				674F9BD61B0A580E00704FFA /* turns_generator.cpp in Sources */,
 				675344171A3F644F00A0A8C3 /* osrm_router.cpp in Sources */,
 				674F9BD21B0A580E00704FFA /* road_graph_router.cpp in Sources */,
+				674A28B11B1605D2001A525C /* osrm_engine.cpp in Sources */,
 				674F9BD41B0A580E00704FFA /* road_graph.cpp in Sources */,
 				6753441E1A3F644F00A0A8C3 /* turns.cpp in Sources */,
 				670B84C01A9381D900CE4492 /* cross_routing_context.cpp in Sources */,