tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-23 00:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[3.2] Add separate simulator flag for iOS build, change main library to xcframework."

Browse Source
This commit is contained in:
Rémi Verschelde
2021-01-27 21:53:16 +01:00
committed by GitHub
parent 9ba95970ad
commit c2ea80348c
11 changed files with 15 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/iphone/export/export.cpp
+4 -4
View File
@@ -1441,9 +1441,9 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
return ERR_SKIP;
}
String library_to_use = "libgodot.iphone." + String(p_debug ? "debug" : "release") + ".xcframework";
String library_to_use = "libgodot.iphone." + String(p_debug ? "debug" : "release") + ".fat.a";
print_line("Static framework: " + library_to_use);
print_line("Static library: " + library_to_use);
String pkg_name;
if (p_preset->get("application/name") != "")
pkg_name = p_preset->get("application/name"); // app_name
@@ -1528,7 +1528,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
if (files_to_parse.has(file)) {
_fix_config_file(p_preset, data, config_data, p_debug);
} else if (file.begins_with("libgodot.iphone")) {
if (!file.begins_with(library_to_use) || file.ends_with(String("/empty"))) {
if (file != library_to_use) {
ret = unzGoToNextFile(src_pkg_zip);
continue; //ignore!
}
@@ -1536,7 +1536,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
#if defined(OSX_ENABLED) || defined(X11_ENABLED)
is_execute = true;
#endif
file = file.replace(library_to_use, binary_name + ".xcframework");
file = "godot_ios.a";
}
if (file == project_file) {