diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-24 09:55:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-24 09:55:24 +0100 |
| commit | 476b8a2249681d8b35bd2bf8ec661db523d5d34b (patch) | |
| tree | bede6fd8f0b5364ab5c18cc8dfd99d579478f3bf /editor/editor_export.cpp | |
| parent | dc85c721441d99e24de21dc8d4cc223455b2ec86 (diff) | |
| parent | 13392a96e9471ba54a6af84140aaa14817fb6a29 (diff) | |
| download | redot-engine-476b8a2249681d8b35bd2bf8ec661db523d5d34b.tar.gz | |
Merge pull request #59416 from aaronfranke/export-file
Diffstat (limited to 'editor/editor_export.cpp')
| -rw-r--r-- | editor/editor_export.cpp | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index bbc104301d..ad77f4641d 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -1794,8 +1794,8 @@ bool EditorExportPlatformPC::can_export(const Ref<EditorExportPreset> &p_preset, // Look for export templates (first official, and if defined custom templates). bool use64 = p_preset->get("binary_format/64_bits"); - bool dvalid = exists_export_template(use64 ? debug_file_64 : debug_file_32, &err); - bool rvalid = exists_export_template(use64 ? release_file_64 : release_file_32, &err); + bool dvalid = exists_export_template(get_template_file_name("debug", use64 ? "64" : "32"), &err); + bool rvalid = exists_export_template(get_template_file_name("release", use64 ? "64" : "32"), &err); if (p_preset->get("custom_template/debug") != "") { dvalid = FileAccess::exists(p_preset->get("custom_template/debug")); @@ -1830,19 +1830,7 @@ Error EditorExportPlatformPC::export_project(const Ref<EditorExportPreset> &p_pr template_path = template_path.strip_edges(); if (template_path.is_empty()) { - if (p_preset->get("binary_format/64_bits")) { - if (p_debug) { - template_path = find_export_template(debug_file_64); - } else { - template_path = find_export_template(release_file_64); - } - } else { - if (p_debug) { - template_path = find_export_template(debug_file_32); - } else { - template_path = find_export_template(release_file_32); - } - } + template_path = find_export_template(get_template_file_name(p_debug ? "debug" : "release", p_preset->get("binary_format/64_bits") ? "64" : "32")); } if (!template_path.is_empty() && !FileAccess::exists(template_path)) { @@ -1921,22 +1909,6 @@ void EditorExportPlatformPC::set_logo(const Ref<Texture2D> &p_logo) { logo = p_logo; } -void EditorExportPlatformPC::set_release_64(const String &p_file) { - release_file_64 = p_file; -} - -void EditorExportPlatformPC::set_release_32(const String &p_file) { - release_file_32 = p_file; -} - -void EditorExportPlatformPC::set_debug_64(const String &p_file) { - debug_file_64 = p_file; -} - -void EditorExportPlatformPC::set_debug_32(const String &p_file) { - debug_file_32 = p_file; -} - void EditorExportPlatformPC::get_platform_features(List<String> *r_features) { r_features->push_back("pc"); //all pcs support "pc" r_features->push_back("s3tc"); //all pcs support "s3tc" compression |