diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2018-09-18 00:01:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 00:01:10 +0200 |
| commit | fe7c6be08d0c20563c6f9fbd7e7e970a0e7fe746 (patch) | |
| tree | 888a11165bac0588bb01ff420b03dd56b7904c39 | |
| parent | a4e4dd396665a29dac63339930a97852bb8cd449 (diff) | |
| parent | e463834a8b7f3b766939154b8a24978c1258994b (diff) | |
| download | redot-engine-fe7c6be08d0c20563c6f9fbd7e7e970a0e7fe746.tar.gz | |
Merge pull request #22199 from neikeq/branch1
Regression: Fixed missing mono internal call
| -rw-r--r-- | modules/mono/SCsub | 1 | ||||
| -rw-r--r-- | modules/mono/editor/godotsharp_editor.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/modules/mono/SCsub b/modules/mono/SCsub index b3a2d26e4a..1d5c145027 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 d2f5782fcb..3ee38515bf 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(); } |