godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00
Code Releases Wiki Activity

Merge pull request #12491 from neikeq/waitasecond···

Browse Source 
Fix FrameworkPathOverride and assemblies path loop
This commit is contained in:
Ignacio Etcheverry
2017-10-29 22:33:27 +01:00
committed by GitHub
parent df0610e9e6 aa5a0b550f
commit 619e4eb23d
3 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/mono/editor/godotsharp_builds.cpp
View File

@@ -32,6 +32,7 @@
#include "main/main.h"
#include "../godotsharp_dirs.h"
#include "../mono_gd/gd_mono.h"
#include "../mono_gd/gd_mono_class.h"
#include "../mono_gd/gd_mono_marshal.h"
#include "../utils/path_utils.h"
@@ -84,10 +85,16 @@ void godot_icall_BuildInstance_get_MSBuildInfo(MonoString **r_msbuild_path, Mono
if (!msbuild_tools_path.ends_with("\\"))
msbuild_tools_path += "\\";
*r_msbuild_path = GDMonoMarshal::mono_string_from_godot(msbuild_tools_path + "MSBuild.exe");
// FrameworkPathOverride
*r_framework_path = GDMonoMarshal::mono_string_from_godot(GDMono::get_singleton()->get_mono_reg_info().assembly_dir);
const MonoRegInfo &mono_reg_info = GDMono::get_singleton()->get_mono_reg_info();
if (mono_reg_info.assembly_dir.length()) {
*r_msbuild_path = GDMonoMarshal::mono_string_from_godot(msbuild_tools_path + "MSBuild.exe");
String framework_path = path_join(mono_reg_info.assembly_dir, "mono", "4.5");
*r_framework_path = GDMonoMarshal::mono_string_from_godot(framework_path);
} else {
ERR_PRINT("Cannot find Mono's assemblies directory in the registry");
}
return;
}
@@ -130,6 +137,7 @@ void godot_icall_BuildInstance_get_MSBuildInfo(MonoString **r_msbuild_path, Mono
return;
#else
ERR_PRINT("Not implemented on this platform");
return;
#endif
}