diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-10-12 22:52:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-12 22:52:59 +0200 |
| commit | f2248969db7e5cb8463f323160bed8d00aae7629 (patch) | |
| tree | 9baeaa0000cc4adfa5a496de093ab5aee88af702 /editor/export | |
| parent | ea47e03b360d0aeee10c1f7ef798f5750c2b1aa8 (diff) | |
| parent | 6daf4c659303c148c2c84d5cc04214eee0ee3654 (diff) | |
Merge pull request #66952 from bruvzg/macos_net_export
Fix macOS .NET export.
Diffstat (limited to 'editor/export')
| -rw-r--r-- | editor/export/editor_export_platform.h | 1 | ||||
| -rw-r--r-- | editor/export/editor_export_platform_pc.cpp | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/editor/export/editor_export_platform.h b/editor/export/editor_export_platform.h index 88dc7bd5cd..5db79b98d1 100644 --- a/editor/export/editor_export_platform.h +++ b/editor/export/editor_export_platform.h @@ -144,6 +144,7 @@ public: }; virtual Ref<EditorExportPreset> create_preset(); + virtual bool is_executable(const String &p_path) const { return false; } virtual void clear_messages() { messages.clear(); } virtual void add_message(ExportMessageType p_type, const String &p_category, const String &p_message) { diff --git a/editor/export/editor_export_platform_pc.cpp b/editor/export/editor_export_platform_pc.cpp index 8538414523..c5b61e9b03 100644 --- a/editor/export/editor_export_platform_pc.cpp +++ b/editor/export/editor_export_platform_pc.cpp @@ -185,10 +185,12 @@ Error EditorExportPlatformPC::export_project_data(const Ref<EditorExportPreset> String src_path = ProjectSettings::get_singleton()->globalize_path(so_files[i].path); String target_path; if (so_files[i].target.is_empty()) { - target_path = p_path.get_base_dir().path_join(src_path.get_file()); + target_path = p_path.get_base_dir(); } else { - target_path = p_path.get_base_dir().path_join(so_files[i].target).path_join(src_path.get_file()); + target_path = p_path.get_base_dir().path_join(so_files[i].target); + da->make_dir_recursive(target_path); } + target_path = target_path.path_join(src_path.get_file()); if (da->dir_exists(src_path)) { err = da->make_dir_recursive(target_path); |