From e463834a8b7f3b766939154b8a24978c1258994b Mon Sep 17 00:00:00 2001 From: Ignacio Etcheverry Date: Mon, 17 Sep 2018 22:54:47 +0200 Subject: [PATCH] Fix missing mono internal call - Also fixed uninitalized variable in buildscript --- modules/mono/SCsub | 1 + modules/mono/editor/godotsharp_editor.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/modules/mono/SCsub b/modules/mono/SCsub index b3a2d26e4ab..1d5c1450270 100644 --- a/modules/mono/SCsub +++ b/modules/mono/SCsub @@ -134,6 +134,7 @@ def find_msbuild_unix(filename): def find_msbuild_windows(): import mono_reg_utils as monoreg + mono_root = '' bits = env['bits'] if bits == '32': diff --git a/modules/mono/editor/godotsharp_editor.cpp b/modules/mono/editor/godotsharp_editor.cpp index d2f5782fcb8..3ee38515bf1 100644 --- a/modules/mono/editor/godotsharp_editor.cpp +++ b/modules/mono/editor/godotsharp_editor.cpp @@ -183,6 +183,10 @@ MonoBoolean godot_icall_MonoDevelopInstance_IsApplicationBundleInstalled(MonoStr #endif } +MonoString *godot_icall_Utils_OS_GetPlatformName() { + return GDMonoMarshal::mono_string_from_godot(OS::get_singleton()->get_name()); +} + void GodotSharpEditor::register_internal_calls() { static bool registered = false; @@ -190,6 +194,7 @@ void GodotSharpEditor::register_internal_calls() { registered = true; mono_add_internal_call("GodotSharpTools.Editor.MonoDevelopInstance::IsApplicationBundleInstalled", (void *)godot_icall_MonoDevelopInstance_IsApplicationBundleInstalled); + mono_add_internal_call("GodotSharpTools.Utils.OS::GetPlatformName", (void *)godot_icall_Utils_OS_GetPlatformName); GodotSharpBuilds::register_internal_calls(); }