asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Editor] Report GDExtension export errors and missing libraries.

Browse source
This commit is contained in:
Fabio Alessandrelli 2022-05-24 09:54:37 +02:00
parent a76db34592
commit cf39f36685
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
editor/plugins/gdextension_export_plugin.h
View file

@ -47,14 +47,9 @@ void GDExtensionExportPlugin::_export_file(const String &p_path, const String &p
config.instantiate(); config.instantiate();
Error err = config->load(p_path); Error err = config->load(p_path);
ERR_FAIL_COND_MSG(err, "Failed to load GDExtension file: " + p_path);
if (err != OK) { ERR_FAIL_COND_MSG(!config->has_section_key("configuration", "entry_symbol"), "Failed to export GDExtension file, missing entry symbol: " + p_path);
return;
}
if (!config->has_section_key("configuration", "entry_symbol")) {
return;
}
String entry_symbol = config->get_value("configuration", "entry_symbol"); String entry_symbol = config->get_value("configuration", "entry_symbol");
@ -62,6 +57,7 @@ void GDExtensionExportPlugin::_export_file(const String &p_path, const String &p
config->get_section_keys("libraries", &libraries); config->get_section_keys("libraries", &libraries);
bool could_export = false;
for (const String &E : libraries) { for (const String &E : libraries) {
Vector<String> tags = E.split("."); Vector<String> tags = E.split(".");
bool all_tags_met = true; bool all_tags_met = true;
@ -101,13 +97,23 @@ void GDExtensionExportPlugin::_export_file(const String &p_path, const String &p
String linker_flags = "-Wl,-U,_" + entry_symbol; String linker_flags = "-Wl,-U,_" + entry_symbol;
add_ios_linker_flags(linker_flags); add_ios_linker_flags(linker_flags);
} }
could_export = true;
break; break;
} }
} }
if (!could_export) {
Vector<String> tags;
for (const String &E : p_features) {
tags.append(E);
}
ERR_FAIL_MSG(vformat("Couldn't export extension: %s. No suitable library found for export flags: %s", p_path, String(", ").join(tags)));
}
List<String> dependencies; List<String> dependencies;
if (config->has_section("dependencies")) {
config->get_section_keys("dependencies", &dependencies);
}
config->get_section_keys("dependencies", &dependencies);
for (const String &E : libraries) { for (const String &E : libraries) {
Vector<String> tags = E.split("."); Vector<String> tags = E.split(".");
bool all_tags_met = true; bool all_tags_met = true;