Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-23 05:31:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #63096 from aaronfranke/exp-template-names

Browse Source
This commit is contained in:
Rémi Verschelde 2022-07-26 10:28:25 +02:00 committed by GitHub
commit ba2cffc575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_export.cpp
View File

@ -1884,8 +1884,8 @@ bool EditorExportPlatformPC::can_export(const Ref<EditorExportPreset> &p_preset,
// Look for export templates (first official, and if defined custom templates). // Look for export templates (first official, and if defined custom templates).
bool use64 = p_preset->get("binary_format/64_bits"); bool use64 = p_preset->get("binary_format/64_bits");
bool dvalid = exists_export_template(get_template_file_name("debug", use64 ? "64" : "32"), &err); bool dvalid = exists_export_template(get_template_file_name("debug", use64 ? "x86_64" : "x86_32"), &err);
bool rvalid = exists_export_template(get_template_file_name("release", use64 ? "64" : "32"), &err); bool rvalid = exists_export_template(get_template_file_name("release", use64 ? "x86_64" : "x86_32"), &err);
if (p_preset->get("custom_template/debug") != "") { if (p_preset->get("custom_template/debug") != "") {
dvalid = FileAccess::exists(p_preset->get("custom_template/debug")); dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));

2
platform/linuxbsd/export/export_plugin.cpp
View File

@ -84,7 +84,7 @@ void EditorExportPlatformLinuxBSD::set_extension(const String &p_extension, cons
} }
String EditorExportPlatformLinuxBSD::get_template_file_name(const String &p_target, const String &p_arch) const { String EditorExportPlatformLinuxBSD::get_template_file_name(const String &p_target, const String &p_arch) const {
return "linux_x11_" + p_arch + "_" + p_target; return "linux_" + p_target + "." + p_arch;
} }
List<String> EditorExportPlatformLinuxBSD::get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const { List<String> EditorExportPlatformLinuxBSD::get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const {

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

@ -766,7 +766,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
int ret = unzGoToFirstFile(src_pkg_zip); int ret = unzGoToFirstFile(src_pkg_zip);
String binary_to_use = "godot_macos_" + String(p_debug ? "debug" : "release") + ".64"; String binary_to_use = "godot_macos_" + String(p_debug ? "debug" : "release") + ".universal";
String pkg_name; String pkg_name;
if (String(ProjectSettings::get_singleton()->get("application/config/name")) != "") { if (String(ProjectSettings::get_singleton()->get("application/config/name")) != "") {
@ -1064,19 +1064,19 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
} }
if (data.size() > 0) { if (data.size() > 0) {
if (file.find("/data.mono.macos.64.release_debug/") != -1) { if (file.find("/data.mono.macos.release_debug.universal/") != -1) {
if (!p_debug) { if (!p_debug) {
ret = unzGoToNextFile(src_pkg_zip); ret = unzGoToNextFile(src_pkg_zip);
continue; // skip continue; // skip
} }
file = file.replace("/data.mono.macos.64.release_debug/", "/GodotSharp/"); file = file.replace("/data.mono.macos.release_debug.universal/", "/GodotSharp/");
} }
if (file.find("/data.mono.macos.64.release/") != -1) { if (file.find("/data.mono.macos.release.universal/") != -1) {
if (p_debug) { if (p_debug) {
ret = unzGoToNextFile(src_pkg_zip); ret = unzGoToNextFile(src_pkg_zip);
continue; // skip continue; // skip
} }
file = file.replace("/data.mono.macos.64.release/", "/GodotSharp/"); file = file.replace("/data.mono.macos.release.universal/", "/GodotSharp/");
} }
if (file.ends_with(".dylib")) { if (file.ends_with(".dylib")) {

2
platform/windows/export/export_plugin.cpp
View File

@ -104,7 +104,7 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset>
} }
String EditorExportPlatformWindows::get_template_file_name(const String &p_target, const String &p_arch) const { String EditorExportPlatformWindows::get_template_file_name(const String &p_target, const String &p_arch) const {
return "windows_" + p_arch + "_" + p_target + ".exe"; return "windows_" + p_target + "_" + p_arch + ".exe";
} }
List<String> EditorExportPlatformWindows::get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const { List<String> EditorExportPlatformWindows::get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const {