Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #67906 from groud/simpler_gdextension_config

Browse source 
Remove unnecessary checks when exporting gdextension binaries and allow using a prefix to auto-detect files
This commit is contained in:
Rémi Verschelde 2022-12-06 11:01:09 +01:00
commit 83b426bca5
No known key found for this signature in database
GPG key ID: C3336907360768E1
8 changed files with 173 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

5
editor/export/editor_export_platform.cpp
View file

@ -442,10 +442,11 @@ HashSet<String> EditorExportPlatform::get_features(const Ref<EditorExportPreset>
result.insert(E);
}
result.insert("template");
if (p_debug) {
result.insert("debug");
result.insert("template_debug");
} else {
result.insert("release");
result.insert("template_release");
}
if (!p_preset->get_custom_features().is_empty()) {

4
editor/export/editor_export_platform_pc.cpp
View file

@ -81,8 +81,8 @@ bool EditorExportPlatformPC::has_valid_export_configuration(const Ref<EditorExpo
// Look for export templates (first official, and if defined custom templates).
String arch = p_preset->get("binary_format/architecture");
bool dvalid = exists_export_template(get_template_file_name("debug", arch), &err);
bool rvalid = exists_export_template(get_template_file_name("release", arch), &err);
bool dvalid = exists_export_template(get_template_file_name("template_debug", arch), &err);
bool rvalid = exists_export_template(get_template_file_name("template_release", arch), &err);
if (p_preset->get("custom_template/debug") != "") {
dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));