Merge pull request #102179 from bruvzg/remove_sim

Disable Metal and Vulkan renderers in simulator builds. Remove simulator support from editor/exporter.

Author: Repiteo

platform/ios/detect.py

@@ -151,8 +151,8 @@ def configure(env: "SConsEnvironment"):
     env.Prepend(CPPPATH=["#platform/ios"])
     env.Append(CPPDEFINES=["IOS_ENABLED", "UNIX_ENABLED", "COREAUDIO_ENABLED"])
 
-    if env["metal"] and env["arch"] != "arm64":
-        print_warning("Target architecture '{}' does not support the Metal rendering driver".format(env["arch"]))
+    if env["metal"] and env["ios_simulator"]:
+        print_warning("iOS simulator does not support the Metal rendering driver")
         env["metal"] = False
 
     if env["metal"]:
@@ -166,11 +166,16 @@ def configure(env: "SConsEnvironment"):
         )
         env.Prepend(CPPPATH=["#thirdparty/spirv-cross"])
 
+    if env["vulkan"] and env["ios_simulator"]:
+        print_warning("iOS simulator does not support the Vulkan rendering driver")
+        env["vulkan"] = False
+
     if env["vulkan"]:
         env.AppendUnique(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
 
     if env["opengl3"]:
         env.Append(CPPDEFINES=["GLES3_ENABLED", "GLES_SILENCE_DEPRECATION"])
+        env.Append(CCFLAGS=["-Wno-module-import-in-extern-c"])
         env.Prepend(
             CPPPATH=[
                 "$IOS_SDK_PATH/System/Library/Frameworks/OpenGLES.framework/Headers",

platform/ios/doc_classes/EditorExportPlatformIOS.xml

@@ -41,9 +41,6 @@
 		<member name="application/export_project_only" type="bool" setter="" getter="">
 			If [code]true[/code], exports iOS project files without building an XCArchive or [code].ipa[/code] file. If [code]false[/code], exports iOS project files and builds an XCArchive and [code].ipa[/code] file at the same time. When combining Godot with Fastlane or other build pipelines, you may want to set this to [code]true[/code].
 		</member>
-		<member name="application/generate_simulator_library_if_missing" type="bool" setter="" getter="">
-			If [code]true[/code], and ARM64 simulator library is missing from the export template, it is automatically generated from ARM64 device library.
-		</member>
 		<member name="application/icon_interpolation" type="int" setter="" getter="">
 			Interpolation method used to resize application icon.
 		</member>