godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22199 from neikeq/branch1

Browse Source 
Regression: Fixed missing mono internal call
This commit is contained in:
Ignacio Etcheverry 2018-09-18 00:01:10 +02:00 committed by GitHub
commit fe7c6be08d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/mono/SCsub
View File

@ -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':

5
modules/mono/editor/godotsharp_editor.cpp
View File

@ -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();
}