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

Merge pull request #17226 from marcelofg55/osx_export_logic 

Modify OSX can_export logic to match the logic from EditorExportPlatformPC::can_export
This commit is contained in:
Rémi Verschelde 2018-03-03 16:20:10 +01:00 committed by GitHub
parent cbb4fe45d0 a42dfd7882
commit cf0bc13588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
platform/osx/export/export.cpp
View File

@ -614,21 +614,27 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
bool EditorExportPlatformOSX::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const { bool EditorExportPlatformOSX::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
bool valid = true; bool valid = false;
String err; String err;
if (!exists_export_template("osx.zip", &err)) { if (exists_export_template("osx.zip", &err)) {
valid = false; valid = true;
} }
if (p_preset->get("custom_package/debug") != "" && !FileAccess::exists(p_preset->get("custom_package/debug"))) { if (p_preset->get("custom_package/debug") != "") {
valid = false; if (FileAccess::exists(p_preset->get("custom_package/debug"))) {
err += "Custom debug package not found.\n"; valid = true;
} else {
err += "Custom debug package not found.\n";
}
} }
if (p_preset->get("custom_package/release") != "" && !FileAccess::exists(p_preset->get("custom_package/release"))) { if (p_preset->get("custom_package/release") != "") {
valid = false; if (FileAccess::exists(p_preset->get("custom_package/release"))) {
err += "Custom release package not found.\n"; valid = true;
} else {
err += "Custom release package not found.\n";
}
} }
if (!err.empty()) if (!err.empty())