aboutsummaryrefslogtreecommitdiff
path: root/modules/mono/editor/godotsharp_builds.cpp
diff options
context:
space:
mode:
authorIgnacio Etcheverry2018-06-05 22:18:43 +0200
committerIgnacio Etcheverry2018-06-05 22:18:43 +0200
commit25f10b3c406761b0bb88bf70da1ba2d8f5335fbd (patch)
treeb1eaefc2fcfa1c0260863da294baa3eeac19c494 /modules/mono/editor/godotsharp_builds.cpp
parent7933a6cc9fcf2b54e19be6b5b18874069a05331b (diff)
downloadgodot-25f10b3c406761b0bb88bf70da1ba2d8f5335fbd.tar.gz
godot-25f10b3c406761b0bb88bf70da1ba2d8f5335fbd.tar.zst
godot-25f10b3c406761b0bb88bf70da1ba2d8f5335fbd.zip
Mono: Fix passing wrong logger assembly path to MSBuild
- Add option to print MSBuild's stdout and stderr instead of redirecting it. This can be enabled by setting the environment variable: Godot_DEBUG_MSBUILD=1
Diffstat (limited to '')
-rw-r--r--modules/mono/editor/godotsharp_builds.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp
index e29384aab..3adfc62d7 100644
--- a/modules/mono/editor/godotsharp_builds.cpp
+++ b/modules/mono/editor/godotsharp_builds.cpp
@@ -527,8 +527,9 @@ void GodotSharpBuilds::BuildProcess::start(bool p_blocking) {
// Call Build
- Variant logger_assembly = OS::get_singleton()->get_executable_path().get_base_dir().plus_file(EDITOR_TOOLS_ASSEMBLY_NAME) + ".dll";
- Variant logger_output_dir = logs_dir;
+ String logger_assembly_path = GDMono::get_singleton()->get_editor_tools_assembly()->get_path();
+ Variant logger_assembly = ProjectSettings::get_singleton()->globalize_path(logger_assembly_path);
+ Variant logger_output_dir = log_dirpath;
Variant custom_props = build_info.custom_props;
const Variant *args[3] = { &logger_assembly, &logger_output_dir, &custom_props };