Fixed compilation for iOS simulator.

4 files changed, 66 insertions, 3 deletions

diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig
index 2cb68b3ff9..8cb6e987fb 100644
--- a/xcode/common.xcconfig
+++ b/xcode/common.xcconfig
@@ -64,7 +64,7 @@ CLANG_UNDEFINED_BEHAVIOR_SANITIZER_INTEGER = YES
 CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES
 CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
 COMPILER_INDEX_STORE_ENABLE = YES
-DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+DEBUG_INFORMATION_FORMAT = dwarf
 ENABLE_BITCODE = YES
 ENABLE_STRICT_OBJC_MSGSEND = YES
 GCC_NO_COMMON_BLOCKS = YES
diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj
index 00a788b48d..05d351dcf7 100644
--- a/xcode/drape/drape.xcodeproj/project.pbxproj
+++ b/xcode/drape/drape.xcodeproj/project.pbxproj
@@ -618,7 +618,7 @@
 /* Begin XCBuildConfiguration section */
 		6729A4FA1A691F6A007D5872 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 34AF87C91DBE4F4900E5E7DC /* common-debug.xcconfig */;
+			baseConfigurationReference = 34AF87CA1DBE4F4900E5E7DC /* common-release.xcconfig */;
 			buildSettings = {
 				ENABLE_TESTABILITY = YES;
 				GCC_OPTIMIZATION_LEVEL = 2;
@@ -660,6 +660,16 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXCLUDED_SOURCE_FILE_NAMES = "";
+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = (
+					metal_base_context.mm,
+					metal_gpu_buffer_impl.mm,
+					metal_mesh_object_impl.mm,
+					metal_states.mm,
+					metal_texture.mm,
+					metal_vertex_array_buffer_impl.mm,
+					render_state_metal.mm,
+					metal_cleaner.mm,
+				);
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = hw_texture_ios.mm;
 				EXECUTABLE_PREFIX = lib;
 				GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp";
@@ -671,6 +681,16 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXCLUDED_SOURCE_FILE_NAMES = "";
+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = (
+					metal_base_context.mm,
+					metal_gpu_buffer_impl.mm,
+					metal_mesh_object_impl.mm,
+					metal_states.mm,
+					metal_texture.mm,
+					metal_vertex_array_buffer_impl.mm,
+					render_state_metal.mm,
+					metal_cleaner.mm,
+				);
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = hw_texture_ios.mm;
 				EXECUTABLE_PREFIX = lib;
 				GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp";
@@ -701,6 +721,16 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXCLUDED_SOURCE_FILE_NAMES = "";
+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = (
+					metal_base_context.mm,
+					metal_gpu_buffer_impl.mm,
+					metal_mesh_object_impl.mm,
+					metal_states.mm,
+					metal_texture.mm,
+					metal_vertex_array_buffer_impl.mm,
+					render_state_metal.mm,
+					metal_cleaner.mm,
+				);
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = hw_texture_ios.mm;
 				EXECUTABLE_PREFIX = lib;
 				GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp";
diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
index 36ef0dcba8..e56311ac57 100644
--- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
+++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
@@ -952,7 +952,7 @@
 /* Begin XCBuildConfiguration section */
 		6709473C1BDF9B82005014C0 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 34AF87CB1DBE508400E5E7DC /* common-debug.xcconfig */;
+			baseConfigurationReference = 34AF87CC1DBE508400E5E7DC /* common-release.xcconfig */;
 			buildSettings = {
 				ENABLE_TESTABILITY = YES;
 				GCC_OPTIMIZATION_LEVEL = 2;
diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj
index de28ab2ed6..acc6aa9bda 100644
--- a/xcode/shaders/shaders.xcodeproj/project.pbxproj
+++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj
@@ -425,6 +425,7 @@
 				4566606A20E254060085E8C1 /* Sources */,
 				4566606B20E254060085E8C1 /* Frameworks */,
 				4566606C20E254060085E8C1 /* CopyFiles */,
+				BB529C26215BE1CA0088A2A5 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -533,6 +534,19 @@
 			shellPath = /bin/sh;
 			shellScript = "python ${SRCROOT}/../../shaders/gl_shaders_preprocessor.py ${SRCROOT}/../../shaders/GL shader_index.txt programs.hpp shaders_lib.glsl ${SRCROOT}/../../shaders gl_shaders";
 		};
+		BB529C26215BE1CA0088A2A5 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "touch ${BUILT_PRODUCTS_DIR}/shaders_metal.metallib";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -622,12 +636,23 @@
 		4566607820E254060085E8C1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = (
+					metal_program_params.mm,
+					metal_program_pool.mm,
+					program_manager_metal.mm,
+				);
 			};
 			name = Debug;
 		};
 		4566607920E254060085E8C1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				EXCLUDED_SOURCE_FILE_NAMES = "";
+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = (
+					metal_program_params.mm,
+					metal_program_pool.mm,
+					program_manager_metal.mm,
+				);
 			};
 			name = Release;
 		};
@@ -647,6 +672,11 @@
 		4566607E20E2552D0085E8C1 /* Production Full */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = (
+					metal_program_params.mm,
+					metal_program_pool.mm,
+					program_manager_metal.mm,
+				);
 			};
 			name = "Production Full";
 		};
@@ -698,18 +728,21 @@
 		4598438021394BE000F8CAB2 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				SUPPORTED_PLATFORMS = "macosx iphoneos";
 			};
 			name = Debug;
 		};
 		4598438121394BE000F8CAB2 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				SUPPORTED_PLATFORMS = "macosx iphoneos";
 			};
 			name = Release;
 		};
 		4598438221394BE000F8CAB2 /* Production Full */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				SUPPORTED_PLATFORMS = "macosx iphoneos";
 			};
 			name = "Production Full";
 		};