Merge pull request #92692 from mihe/always-embed-frameworks

Fix iOS exports never embedding framework bundles
This commit is contained in:
Rémi Verschelde 2024-06-03 10:36:10 +02:00
commit f976a625e1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 1 additions and 6 deletions

View File

@ -1357,12 +1357,7 @@ void EditorExportPlatformIOS::_add_assets_to_project(const String &p_out_dir, co
String type; String type;
if (asset.exported_path.ends_with(".framework")) { if (asset.exported_path.ends_with(".framework")) {
int total_libs = 0; if (asset.should_embed) {
int static_libs = 0;
int dylibs = 0;
int frameworks = 0;
_check_xcframework_content(p_out_dir.path_join(asset.exported_path), total_libs, static_libs, dylibs, frameworks);
if (asset.should_embed && (static_libs != total_libs)) {
additional_asset_info_format += "$framework_id = {isa = PBXBuildFile; fileRef = $ref_id; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };\n"; additional_asset_info_format += "$framework_id = {isa = PBXBuildFile; fileRef = $ref_id; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };\n";
framework_id = (++current_id).str(); framework_id = (++current_id).str();
pbx_embeded_frameworks += framework_id + ",\n"; pbx_embeded_frameworks += framework_id + ",\n";