diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2021-01-18 09:52:43 +0200 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2021-01-18 10:36:14 +0200 |
| commit | efd8f277903f036b560e9580c588538a7e3e68de (patch) | |
| tree | b4c350fc5c14132340a720fabef0e1fc33c7783f /platform/iphone/export | |
| parent | 49b5776e8bd62b4bfb6511cca770611b6a3062e4 (diff) | |
[WIP] Add separate `simulator` flag for iOS build, change main library to `xcframework` format.
Diffstat (limited to 'platform/iphone/export')
| -rw-r--r-- | platform/iphone/export/export.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp index a8561c79ab..011dc83ee1 100644 --- a/platform/iphone/export/export.cpp +++ b/platform/iphone/export/export.cpp @@ -1575,9 +1575,9 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p return ERR_SKIP; } - String library_to_use = "libgodot.iphone." + String(p_debug ? "debug" : "release") + ".fat.a"; + String library_to_use = "libgodot.iphone." + String(p_debug ? "debug" : "release") + ".xcframework"; - print_line("Static library: " + library_to_use); + print_line("Static framework: " + library_to_use); String pkg_name; if (p_preset->get("application/name") != "") { pkg_name = p_preset->get("application/name"); // app_name @@ -1663,7 +1663,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 != library_to_use) { + if (!file.begins_with(library_to_use) || file.ends_with(String("/empty"))) { ret = unzGoToNextFile(src_pkg_zip); continue; //ignore! } @@ -1671,7 +1671,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p #if defined(OSX_ENABLED) || defined(X11_ENABLED) is_execute = true; #endif - file = "godot_ios.a"; + file = file.replace(library_to_use, binary_name + ".xcframework"); } if (file == project_file) { |