Skip to content

Commit

Permalink
[Windows] Support all possible suffixes for console wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
AThousandShips committed Apr 8, 2024
1 parent 97b5c14 commit 07c7306
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions editor/export/editor_export_platform_pc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,28 @@ Error EditorExportPlatformPC::prepare_template(const Ref<EditorExportPreset> &p_
return ERR_FILE_NOT_FOUND;
}

String wrapper_template_path = template_path.get_basename() + "_console.exe";
// Matching the extensions in platform/windows/console_wrapper_windows.cpp
static const char *const wrapper_extensions[] = {
".console.exe",
"_console.exe",
" console.exe",
"console.exe",
nullptr,
};
int con_wrapper_mode = p_preset->get("debug/export_console_wrapper");
bool copy_wrapper = (con_wrapper_mode == 1 && p_debug) || (con_wrapper_mode == 2);

Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
da->make_dir_recursive(p_path.get_base_dir());
Error err = da->copy(template_path, p_path, get_chmod_flags());
if (err == OK && copy_wrapper && FileAccess::exists(wrapper_template_path)) {
err = da->copy(wrapper_template_path, p_path.get_basename() + ".console.exe", get_chmod_flags());
if (err == OK && copy_wrapper) {
for (int i = 0; wrapper_extensions[i]; ++i) {
const String wrapper_path = template_path.get_basename() + wrapper_extensions[i];
if (FileAccess::exists(wrapper_path)) {
err = da->copy(wrapper_path, p_path.get_basename() + ".console.exe", get_chmod_flags());
break;
}
}
}
if (err != OK) {
add_message(EXPORT_MESSAGE_ERROR, TTR("Prepare Template"), TTR("Failed to copy export template."));
Expand Down

0 comments on commit 07c7306

Please sign in to comment.