1 files changed, 258 insertions, 11 deletions

diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp
index 2194804b3b..b99e825540 100644
--- a/platform/ios/export/export_plugin.cpp
+++ b/platform/ios/export/export_plugin.cpp
@@ -40,6 +40,8 @@
 #include "editor/editor_paths.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
+#include "editor/export/lipo.h"
+#include "editor/export/macho.h"
 #include "editor/import/resource_importer_texture_settings.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
@@ -248,7 +250,7 @@ bool EditorExportPlatformIOS::get_export_option_visibility(const EditorExportPre
 	}
 
 	bool advanced_options_enabled = p_preset->are_advanced_options_enabled();
-	if (p_option.begins_with("privacy")) {
+	if (p_option.begins_with("privacy") || p_option == "application/generate_simulator_library_if_missing") {
 		return advanced_options_enabled;
 	}
 
@@ -280,6 +282,7 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options)
 	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/short_version", PROPERTY_HINT_PLACEHOLDER_TEXT, "Leave empty to use project version"), ""));
 	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/version", PROPERTY_HINT_PLACEHOLDER_TEXT, "Leave empty to use project version"), ""));
 
+	// TODO(sgc): set to iOS 14.0 for Metal
 	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/min_ios_version"), "12.0"));
 
 	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/additional_plist_content", PROPERTY_HINT_MULTILINE_TEXT), ""));
@@ -288,6 +291,7 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options)
 
 	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "application/export_project_only"), false));
 	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "application/delete_old_export_files_unconditionally"), false));
+	r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "application/generate_simulator_library_if_missing"), true));
 
 	Vector<PluginConfigIOS> found_plugins = get_plugins();
 	for (int i = 0; i < found_plugins.size(); i++) {
@@ -1150,6 +1154,167 @@ struct ExportLibsData {
 	String dest_dir;
 };
 
+bool EditorExportPlatformIOS::_archive_has_arm64(const String &p_path, uint32_t *r_cputype, uint32_t *r_cpusubtype) const {
+	bool has_arm64_image = false;
+	if (FileAccess::exists(p_path)) {
+		if (LipO::is_lipo(p_path)) {
+			// LipO.
+			Ref<LipO> lipo;
+			lipo.instantiate();
+			if (lipo->open_file(p_path)) {
+				for (int i = 0; i < lipo->get_arch_count(); i++) {
+					if (lipo->get_arch_cputype(i) == 0x100000c && lipo->get_arch_cpusubtype(i) == 0) {
+						has_arm64_image = true;
+						break;
+					}
+				}
+			}
+			lipo->close();
+		} else {
+			// Single architecture archive.
+			Ref<FileAccess> sim_f = FileAccess::open(p_path, FileAccess::READ);
+			if (sim_f.is_valid()) {
+				char magic[9] = {};
+				sim_f->get_buffer((uint8_t *)&magic[0], 8);
+				if (String(magic) == String("!<arch>\n")) {
+					while (!sim_f->eof_reached()) {
+						// Read file metadata.
+						char name_short[17] = {};
+						char size_short[11] = {};
+						sim_f->get_buffer((uint8_t *)&name_short[0], 16);
+						sim_f->seek(sim_f->get_position() + 12 + 6 + 6 + 8); // Skip modification time, owner ID, group ID, file mode.
+						sim_f->get_buffer((uint8_t *)&size_short[0], 10);
+						sim_f->seek(sim_f->get_position() + 2); // Skip end marker.
+
+						int64_t file_size = String(size_short).to_int();
+						int64_t next_off = sim_f->get_position() + file_size;
+
+						String name = String(name_short); // Skip extended name.
+						if (name.is_empty() || file_size == 0) {
+							break;
+						}
+						if (name.begins_with("#1/")) {
+							int64_t name_len = String(name_short).replace("#1/", "").to_int();
+							sim_f->seek(sim_f->get_position() + name_len);
+						}
+
+						// Read file content.
+						uint32_t obj_magic = sim_f->get_32();
+
+						bool swap = (obj_magic == 0xcffaedfe || obj_magic == 0xcefaedfe);
+						if (obj_magic == 0xcefaedfe || obj_magic == 0xfeedface || obj_magic == 0xcffaedfe || obj_magic == 0xfeedfacf) {
+							uint32_t cputype = sim_f->get_32();
+							uint32_t cpusubtype = sim_f->get_32();
+							if (swap) {
+								cputype = BSWAP32(cputype);
+								cpusubtype = BSWAP32(cpusubtype);
+							}
+							if (r_cputype) {
+								*r_cputype = cputype;
+							}
+							if (r_cpusubtype) {
+								*r_cpusubtype = cpusubtype;
+							}
+							if (cputype == 0x100000c && cpusubtype == 0) {
+								has_arm64_image = true;
+							}
+							break;
+						}
+						sim_f->seek(next_off);
+					}
+				}
+				sim_f->close();
+			}
+		}
+	}
+	return has_arm64_image;
+}
+
+int EditorExportPlatformIOS::_archive_convert_to_simulator(const String &p_path) const {
+	int commands_patched = 0;
+	Ref<FileAccess> sim_f = FileAccess::open(p_path, FileAccess::READ_WRITE);
+	if (sim_f.is_valid()) {
+		char magic[9] = {};
+		sim_f->get_buffer((uint8_t *)&magic[0], 8);
+		if (String(magic) == String("!<arch>\n")) {
+			while (!sim_f->eof_reached()) {
+				// Read file metadata.
+				char name_short[17] = {};
+				char size_short[11] = {};
+				sim_f->get_buffer((uint8_t *)&name_short[0], 16);
+				sim_f->seek(sim_f->get_position() + 12 + 6 + 6 + 8); // Skip modification time, owner ID, group ID, file mode.
+				sim_f->get_buffer((uint8_t *)&size_short[0], 10);
+				sim_f->seek(sim_f->get_position() + 2); // Skip end marker.
+
+				int64_t file_size = String(size_short).to_int();
+				int64_t next_off = sim_f->get_position() + file_size;
+
+				String name = String(name_short); // Skip extended name.
+				if (name.is_empty() || file_size == 0) {
+					break;
+				}
+				if (name.begins_with("#1/")) {
+					int64_t name_len = String(name_short).replace("#1/", "").to_int();
+					sim_f->seek(sim_f->get_position() + name_len);
+				}
+
+				// Read file content.
+				uint32_t obj_magic = sim_f->get_32();
+
+				bool swap = (obj_magic == 0xcffaedfe || obj_magic == 0xcefaedfe);
+				if (obj_magic == 0xcefaedfe || obj_magic == 0xfeedface || obj_magic == 0xcffaedfe || obj_magic == 0xfeedfacf) {
+					uint32_t cputype = sim_f->get_32();
+					uint32_t cpusubtype = sim_f->get_32();
+					uint32_t filetype = sim_f->get_32();
+					uint32_t ncmds = sim_f->get_32();
+					sim_f->get_32(); // Commands total size.
+					sim_f->get_32(); // Commands flags.
+					if (obj_magic == 0xcffaedfe || obj_magic == 0xfeedfacf) {
+						sim_f->get_32(); // Reserved, 64-bit only.
+					}
+					if (swap) {
+						ncmds = BSWAP32(ncmds);
+						cputype = BSWAP32(cputype);
+						cpusubtype = BSWAP32(cpusubtype);
+						filetype = BSWAP32(filetype);
+					}
+					if (cputype == 0x100000C && cpusubtype == 0 && filetype == 1) {
+						// ARM64, object file.
+						for (uint32_t i = 0; i < ncmds; i++) {
+							int64_t cmdofs = sim_f->get_position();
+							uint32_t cmdid = sim_f->get_32();
+							uint32_t cmdsize = sim_f->get_32();
+							if (swap) {
+								cmdid = BSWAP32(cmdid);
+								cmdsize = BSWAP32(cmdsize);
+							}
+							if (cmdid == MachO::LoadCommandID::LC_BUILD_VERSION) {
+								int64_t platform = sim_f->get_32();
+								if (swap) {
+									platform = BSWAP32(platform);
+								}
+								if (platform == MachO::PlatformID::PLATFORM_IOS) {
+									sim_f->seek(cmdofs + 4 + 4);
+									uint32_t new_id = MachO::PlatformID::PLATFORM_IOSSIMULATOR;
+									if (swap) {
+										new_id = BSWAP32(new_id);
+									}
+									sim_f->store_32(new_id);
+									commands_patched++;
+								}
+							}
+							sim_f->seek(cmdofs + cmdsize);
+						}
+					}
+				}
+				sim_f->seek(next_off);
+			}
+		}
+		sim_f->close();
+	}
+	return commands_patched;
+}
+
 void EditorExportPlatformIOS::_check_xcframework_content(const String &p_path, int &r_total_libs, int &r_static_libs, int &r_dylibs, int &r_frameworks) const {
 	Ref<PList> plist;
 	plist.instantiate();
@@ -1464,7 +1629,7 @@ Error EditorExportPlatformIOS::_copy_asset(const Ref<EditorExportPreset> &p_pres
 
 		asset_path = asset_path.path_join(framework_name);
 		destination_dir = p_out_dir.path_join(asset_path);
-		destination = destination_dir.path_join(file_name);
+		destination = destination_dir;
 
 		// Convert to framework and copy.
 		Error err = _convert_to_framework(p_asset, destination, p_preset->get("application/bundle_identifier"));
@@ -1852,11 +2017,11 @@ Error EditorExportPlatformIOS::_export_ios_plugins(const Ref<EditorExportPreset>
 	return OK;
 }
 
-Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
+Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, BitField<EditorExportPlatform::DebugFlags> p_flags) {
 	return _export_project_helper(p_preset, p_debug, p_path, p_flags, false, false);
 }
 
-Error EditorExportPlatformIOS::_export_project_helper(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags, bool p_simulator, bool p_oneclick) {
+Error EditorExportPlatformIOS::_export_project_helper(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, BitField<EditorExportPlatform::DebugFlags> p_flags, bool p_simulator, bool p_oneclick) {
 	ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags);
 
 	const String dest_dir = p_path.get_base_dir() + "/";
@@ -2146,7 +2311,7 @@ Error EditorExportPlatformIOS::_export_project_helper(const Ref<EditorExportPres
 		ret = unzGoToNextFile(src_pkg_zip);
 	}
 
-	/* we're done with our source zip */
+	// We're done with our source zip.
 	unzClose(src_pkg_zip);
 
 	if (!found_library) {
@@ -2154,6 +2319,80 @@ Error EditorExportPlatformIOS::_export_project_helper(const Ref<EditorExportPres
 		return ERR_FILE_NOT_FOUND;
 	}
 
+	// Check and generate missing ARM64 simulator library.
+	if (p_preset->get("application/generate_simulator_library_if_missing").operator bool()) {
+		String sim_lib_path = dest_dir + String(binary_name + ".xcframework").path_join("ios-arm64_x86_64-simulator").path_join("libgodot.a");
+		String dev_lib_path = dest_dir + String(binary_name + ".xcframework").path_join("ios-arm64").path_join("libgodot.a");
+		String tmp_lib_path = EditorPaths::get_singleton()->get_cache_dir().path_join(binary_name + "_lipo_");
+		uint32_t cputype = 0;
+		uint32_t cpusubtype = 0;
+		if (!_archive_has_arm64(sim_lib_path, &cputype, &cpusubtype) && _archive_has_arm64(dev_lib_path) && FileAccess::exists(dev_lib_path)) {
+			add_message(EXPORT_MESSAGE_INFO, TTR("Export"), TTR("ARM64 simulator library, generating from device library."));
+
+			Vector<String> tmp_lib_files;
+			Vector<Vector2i> tmp_lib_cputypes;
+			// Extract/copy simulator lib.
+			if (FileAccess::exists(sim_lib_path)) {
+				if (LipO::is_lipo(sim_lib_path)) {
+					Ref<LipO> lipo;
+					lipo.instantiate();
+					if (lipo->open_file(sim_lib_path)) {
+						for (int i = 0; i < lipo->get_arch_count(); i++) {
+							const String &f_name = tmp_lib_path + itos(tmp_lib_files.size());
+							lipo->extract_arch(i, f_name);
+							tmp_lib_files.push_back(f_name);
+							tmp_lib_cputypes.push_back(Vector2i(lipo->get_arch_cputype(i), lipo->get_arch_cpusubtype(i)));
+						}
+					}
+				} else {
+					const String &f_name = tmp_lib_path + itos(tmp_lib_files.size());
+					tmp_app_path->copy(sim_lib_path, f_name);
+					tmp_lib_files.push_back(f_name);
+					tmp_lib_cputypes.push_back(Vector2i(cputype, cpusubtype));
+				}
+			}
+			// Copy device lib.
+			if (LipO::is_lipo(dev_lib_path)) {
+				Ref<LipO> lipo;
+				lipo.instantiate();
+				if (lipo->open_file(dev_lib_path)) {
+					for (int i = 0; i < lipo->get_arch_count(); i++) {
+						if (lipo->get_arch_cputype(i) == 0x100000c && lipo->get_arch_cpusubtype(i) == 0) {
+							const String &f_name = tmp_lib_path + itos(tmp_lib_files.size());
+							lipo->extract_arch(i, f_name);
+							tmp_lib_files.push_back(f_name);
+							tmp_lib_cputypes.push_back(Vector2i(0x100000c, 0)); // ARM64.
+							break;
+						}
+					}
+				}
+			} else {
+				const String &f_name = tmp_lib_path + itos(tmp_lib_files.size());
+				tmp_app_path->copy(dev_lib_path, f_name);
+				tmp_lib_files.push_back(f_name);
+				tmp_lib_cputypes.push_back(Vector2i(0x100000c, 0)); // ARM64.
+			}
+
+			// Patch device lib.
+			int patch_count = _archive_convert_to_simulator(tmp_lib_path + itos(tmp_lib_files.size() - 1));
+			if (patch_count == 0) {
+				add_message(EXPORT_MESSAGE_WARNING, TTR("Export"), TTR("Unable to generate ARM64 simulator library."));
+			} else {
+				// Repack.
+				Ref<LipO> lipo;
+				lipo.instantiate();
+				lipo->create_file(sim_lib_path, tmp_lib_files, tmp_lib_cputypes);
+			}
+
+			// Cleanup.
+			for (const String &E : tmp_lib_files) {
+				tmp_app_path->remove(E);
+			}
+		}
+	}
+
+	// Generate translations files.
+
 	Dictionary appnames = GLOBAL_GET("application/config/name_localized");
 	Dictionary camera_usage_descriptions = p_preset->get("privacy/camera_usage_description_localized");
 	Dictionary microphone_usage_descriptions = p_preset->get("privacy/microphone_usage_description_localized");
@@ -2418,6 +2657,13 @@ bool EditorExportPlatformIOS::has_valid_export_configuration(const Ref<EditorExp
 		}
 	}
 
+	if (GLOBAL_GET("rendering/rendering_device/driver.ios") == "metal") {
+		float version = p_preset->get("application/min_ios_version").operator String().to_float();
+		if (version < 14.0) {
+			err += TTR("Metal renderer require iOS 14+.") + "\n";
+		}
+	}
+
 	if (!err.is_empty()) {
 		r_error = err;
 	}
@@ -2733,10 +2979,11 @@ void EditorExportPlatformIOS::_update_preset_status() {
 	} else {
 		has_runnable_preset.clear();
 	}
+	devices_changed.set();
 }
 #endif
 
-Error EditorExportPlatformIOS::run(const Ref<EditorExportPreset> &p_preset, int p_device, int p_debug_flags) {
+Error EditorExportPlatformIOS::run(const Ref<EditorExportPreset> &p_preset, int p_device, BitField<EditorExportPlatform::DebugFlags> p_debug_flags) {
 #ifdef MACOS_ENABLED
 	ERR_FAIL_INDEX_V(p_device, devices.size(), ERR_INVALID_PARAMETER);
 
@@ -2782,11 +3029,11 @@ Error EditorExportPlatformIOS::run(const Ref<EditorExportPreset> &p_preset, int
 	String host = EDITOR_GET("network/debug/remote_host");
 	int remote_port = (int)EDITOR_GET("network/debug/remote_port");
 
-	if (p_debug_flags & DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST) {
+	if (p_debug_flags.has_flag(DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST)) {
 		host = "localhost";
 	}
 
-	if (p_debug_flags & DEBUG_FLAG_DUMB_CLIENT) {
+	if (p_debug_flags.has_flag(DEBUG_FLAG_DUMB_CLIENT)) {
 		int port = EDITOR_GET("filesystem/file_server/port");
 		String passwd = EDITOR_GET("filesystem/file_server/password");
 		cmd_args_list.push_back("--remote-fs");
@@ -2797,7 +3044,7 @@ Error EditorExportPlatformIOS::run(const Ref<EditorExportPreset> &p_preset, int
 		}
 	}
 
-	if (p_debug_flags & DEBUG_FLAG_REMOTE_DEBUG) {
+	if (p_debug_flags.has_flag(DEBUG_FLAG_REMOTE_DEBUG)) {
 		cmd_args_list.push_back("--remote-debug");
 
 		cmd_args_list.push_back(get_debug_protocol() + host + ":" + String::num(remote_port));
@@ -2819,11 +3066,11 @@ Error EditorExportPlatformIOS::run(const Ref<EditorExportPreset> &p_preset, int
 		}
 	}
 
-	if (p_debug_flags & DEBUG_FLAG_VIEW_COLLISIONS) {
+	if (p_debug_flags.has_flag(DEBUG_FLAG_VIEW_COLLISIONS)) {
 		cmd_args_list.push_back("--debug-collisions");
 	}
 
-	if (p_debug_flags & DEBUG_FLAG_VIEW_NAVIGATION) {
+	if (p_debug_flags.has_flag(DEBUG_FLAG_VIEW_NAVIGATION)) {
 		cmd_args_list.push_back("--debug-navigation");
 	}