feat: updated godot version
This commit is contained in:
parent
0c508b0831
commit
42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
|
|
@ -36,14 +36,11 @@
|
|||
|
||||
#include "core/config/project_settings.h"
|
||||
#include "core/io/dir_access.h"
|
||||
#include "core/io/file_access.h"
|
||||
#include "core/io/zip_io.h"
|
||||
#include "core/os/os.h"
|
||||
#include "core/io/image_loader.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_string_names.h"
|
||||
#include "editor/export/editor_export.h"
|
||||
#include "editor/file_system/editor_paths.h"
|
||||
#include "editor/settings/editor_settings.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/resources/image_texture.h"
|
||||
|
||||
|
|
@ -924,7 +921,15 @@ Ref<Texture2D> EditorExportPlatformWindows::get_run_icon() const {
|
|||
}
|
||||
|
||||
bool EditorExportPlatformWindows::poll_export() {
|
||||
Ref<EditorExportPreset> preset = EditorExport::get_singleton()->get_runnable_preset_for_platform(this);
|
||||
Ref<EditorExportPreset> preset;
|
||||
|
||||
for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) {
|
||||
Ref<EditorExportPreset> ep = EditorExport::get_singleton()->get_export_preset(i);
|
||||
if (ep->is_runnable() && ep->get_platform() == this) {
|
||||
preset = ep;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int prev = menu_options;
|
||||
menu_options = (preset.is_valid() && preset->get("ssh_remote_deploy/enabled").operator bool());
|
||||
|
|
@ -1007,19 +1012,19 @@ Error EditorExportPlatformWindows::run(const Ref<EditorExportPreset> &p_preset,
|
|||
|
||||
const String basepath = dest.path_join("tmp_windows_export");
|
||||
|
||||
#define CLEANUP_AND_RETURN(m_err) \
|
||||
{ \
|
||||
if (da->file_exists(basepath + ".zip")) { \
|
||||
da->remove(basepath + ".zip"); \
|
||||
} \
|
||||
#define CLEANUP_AND_RETURN(m_err) \
|
||||
{ \
|
||||
if (da->file_exists(basepath + ".zip")) { \
|
||||
da->remove(basepath + ".zip"); \
|
||||
} \
|
||||
if (da->file_exists(basepath + "_start.ps1")) { \
|
||||
da->remove(basepath + "_start.ps1"); \
|
||||
} \
|
||||
da->remove(basepath + "_start.ps1"); \
|
||||
} \
|
||||
if (da->file_exists(basepath + "_clean.ps1")) { \
|
||||
da->remove(basepath + "_clean.ps1"); \
|
||||
} \
|
||||
return m_err; \
|
||||
} \
|
||||
da->remove(basepath + "_clean.ps1"); \
|
||||
} \
|
||||
return m_err; \
|
||||
} \
|
||||
((void)0)
|
||||
|
||||
if (ep.step(TTR("Exporting project..."), 1)) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue