godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Finish checking templates before validating texture formats

Browse Source
This commit is contained in:
Aaron Franke 2023-06-19 21:35:58 -05:00
parent 217a20a8a0
commit a981158d1a
No known key found for this signature in database
GPG Key ID: 40A1750B977E56BF
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
platform/macos/export/export_plugin.cpp
View File

@ -2083,8 +2083,6 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
bool EditorExportPlatformMacOS::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates, bool p_debug) const { bool EditorExportPlatformMacOS::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates, bool p_debug) const {
String err; String err;
bool valid = false;
// Look for export templates (custom templates). // Look for export templates (custom templates).
bool dvalid = false; bool dvalid = false;
bool rvalid = false; bool rvalid = false;
@ -2102,8 +2100,17 @@ bool EditorExportPlatformMacOS::has_valid_export_configuration(const Ref<EditorE
} }
} }
String architecture = p_preset->get("binary_format/architecture"); // Look for export templates (official templates, check only is custom templates are not set).
if (!dvalid || !rvalid) {
dvalid = exists_export_template("macos.zip", &err);
rvalid = dvalid; // Both in the same ZIP.
}
bool valid = dvalid || rvalid;
r_missing_templates = !valid;
// Check the texture formats, which vary depending on the target architecture.
String architecture = p_preset->get("binary_format/architecture");
if (architecture == "universal" || architecture == "x86_64") { if (architecture == "universal" || architecture == "x86_64") {
const String bc_error = test_bc(); const String bc_error = test_bc();
if (!bc_error.is_empty()) { if (!bc_error.is_empty()) {
@ -2120,19 +2127,9 @@ bool EditorExportPlatformMacOS::has_valid_export_configuration(const Ref<EditorE
ERR_PRINT("Invalid architecture"); ERR_PRINT("Invalid architecture");
} }
// Look for export templates (official templates, check only is custom templates are not set).
if (!dvalid || !rvalid) {
dvalid = exists_export_template("macos.zip", &err);
rvalid = dvalid; // Both in the same ZIP.
}
valid = dvalid || rvalid;
r_missing_templates = !valid;
if (!err.is_empty()) { if (!err.is_empty()) {
r_error = err; r_error = err;
} }
return valid; return valid;
} }