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

Merge pull request #49562 from RandomShaper/fix_mono_build 

Improve & fix Mono build
This commit is contained in:
Rémi Verschelde 2021-06-13 11:45:43 +02:00 committed by GitHub
parent e866a53428 f59488e94e
commit de2250d786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/csharp_script.cpp
View File

@ -1444,7 +1444,7 @@ bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_b
// Unsafe refcount increment. The managed instance also counts as a reference. // Unsafe refcount increment. The managed instance also counts as a reference.
// This way if the unmanaged world has no references to our owner // This way if the unmanaged world has no references to our owner
// but the managed instance is alive, the refcount will be 1 instead of 0. // but the managed instance is alive, the refcount will be 1 instead of 0.
// See: godot_icall_Reference_Dtor(MonoObject *p_obj, Object *p_ptr) // See: godot_icall_RefCounted_Dtor(MonoObject *p_obj, Object *p_ptr)
rc->reference(); rc->reference();
CSharpLanguage::get_singleton()->post_unsafe_reference(rc); CSharpLanguage::get_singleton()->post_unsafe_reference(rc);

6
modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
View File

@ -371,7 +371,7 @@ namespace GodotTools
return (ExternalEditorId)editorSettings.GetSetting("mono/editor/external_editor") != ExternalEditorId.None; return (ExternalEditorId)editorSettings.GetSetting("mono/editor/external_editor") != ExternalEditorId.None;
} }
public override bool Build() public override bool _Build()
{ {
return BuildManager.EditorBuildCallback(); return BuildManager.EditorBuildCallback();
} }
@ -413,9 +413,9 @@ namespace GodotTools
bottomPanelBtn.Icon = MSBuildPanel.BuildOutputView.BuildStateIcon; bottomPanelBtn.Icon = MSBuildPanel.BuildOutputView.BuildStateIcon;
} }
public override void EnablePlugin() public override void _EnablePlugin()
{ {
base.EnablePlugin(); base._EnablePlugin();
if (Instance != null) if (Instance != null)
throw new InvalidOperationException(); throw new InvalidOperationException();

4
modules/mono/glue/GodotSharp/GodotSharp/Core/Object.base.cs
View File

@ -66,7 +66,7 @@ namespace Godot
if (memoryOwn) if (memoryOwn)
{ {
memoryOwn = false; memoryOwn = false;
godot_icall_Reference_Disposed(this, ptr, !disposing); godot_icall_RefCounted_Disposed(this, ptr, !disposing);
} }
else else
{ {
@ -129,7 +129,7 @@ namespace Godot
internal static extern void godot_icall_Object_Disposed(Object obj, IntPtr ptr); internal static extern void godot_icall_Object_Disposed(Object obj, IntPtr ptr);
[MethodImpl(MethodImplOptions.InternalCall)] [MethodImpl(MethodImplOptions.InternalCall)]
internal static extern void godot_icall_Reference_Disposed(Object obj, IntPtr ptr, bool isFinalizer); internal static extern void godot_icall_RefCounted_Disposed(Object obj, IntPtr ptr, bool isFinalizer);
[MethodImpl(MethodImplOptions.InternalCall)] [MethodImpl(MethodImplOptions.InternalCall)]
internal static extern void godot_icall_Object_ConnectEventSignals(IntPtr obj); internal static extern void godot_icall_Object_ConnectEventSignals(IntPtr obj);

14
modules/mono/glue/base_object_glue.cpp
View File

@ -78,7 +78,7 @@ void godot_icall_Object_Disposed(MonoObject *p_obj, Object *p_ptr) {
} }
} }
void godot_icall_Reference_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolean p_is_finalizer) { void godot_icall_RefCounted_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolean p_is_finalizer) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
CRASH_COND(p_ptr == nullptr); CRASH_COND(p_ptr == nullptr);
// This is only called with RefCounted derived classes // This is only called with RefCounted derived classes
@ -88,7 +88,7 @@ void godot_icall_Reference_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolea
RefCounted *rc = static_cast<RefCounted *>(p_ptr); RefCounted *rc = static_cast<RefCounted *>(p_ptr);
if (rc->get_script_instance()) { if (rc->get_script_instance()) {
CSharpInstance *cs_instance = CAST_CSHARP_INSTANCE(ref->get_script_instance()); CSharpInstance *cs_instance = CAST_CSHARP_INSTANCE(rc->get_script_instance());
if (cs_instance) { if (cs_instance) {
if (!cs_instance->is_destructing_script_instance()) { if (!cs_instance->is_destructing_script_instance()) {
bool delete_owner; bool delete_owner;
@ -108,11 +108,11 @@ void godot_icall_Reference_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolea
// Unsafe refcount decrement. The managed instance also counts as a reference. // Unsafe refcount decrement. The managed instance also counts as a reference.
// See: CSharpLanguage::alloc_instance_binding_data(Object *p_object) // See: CSharpLanguage::alloc_instance_binding_data(Object *p_object)
CSharpLanguage::get_singleton()->pre_unsafe_unreference(ref); CSharpLanguage::get_singleton()->pre_unsafe_unreference(rc);
if (ref->unreference()) { if (rc->unreference()) {
memdelete(ref); memdelete(rc);
} else { } else {
void *data = ref->get_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index()); void *data = rc->get_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index());
if (data) { if (data) {
CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get(); CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();
@ -242,7 +242,7 @@ MonoString *godot_icall_Object_ToString(Object *p_ptr) {
void godot_register_object_icalls() { void godot_register_object_icalls() {
GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_Ctor", godot_icall_Object_Ctor); GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_Ctor", godot_icall_Object_Ctor);
GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_Disposed", godot_icall_Object_Disposed); GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_Disposed", godot_icall_Object_Disposed);
GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Reference_Disposed", godot_icall_Reference_Disposed); GDMonoUtils::add_internal_call("Godot.Object::godot_icall_RefCounted_Disposed", godot_icall_RefCounted_Disposed);
GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_ConnectEventSignals", godot_icall_Object_ConnectEventSignals); GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_ConnectEventSignals", godot_icall_Object_ConnectEventSignals);
GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_ClassDB_get_method", godot_icall_Object_ClassDB_get_method); GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_ClassDB_get_method", godot_icall_Object_ClassDB_get_method);
GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_ToString", godot_icall_Object_ToString); GDMonoUtils::add_internal_call("Godot.Object::godot_icall_Object_ToString", godot_icall_Object_ToString);

2
modules/mono/mono_gd/gd_mono_internals.cpp
View File

@ -80,7 +80,7 @@ void tie_managed_to_unmanaged(MonoObject *managed, Object *unmanaged) {
// Unsafe refcount increment. The managed instance also counts as a reference. // Unsafe refcount increment. The managed instance also counts as a reference.
// This way if the unmanaged world has no references to our owner // This way if the unmanaged world has no references to our owner
// but the managed instance is alive, the refcount will be 1 instead of 0. // but the managed instance is alive, the refcount will be 1 instead of 0.
// See: godot_icall_Reference_Dtor(MonoObject *p_obj, Object *p_ptr) // See: godot_icall_RefCounted_Dtor(MonoObject *p_obj, Object *p_ptr)
// May not me referenced yet, so we must use init_ref() instead of reference() // May not me referenced yet, so we must use init_ref() instead of reference()
if (rc->init_ref()) { if (rc->init_ref()) {

2
modules/mono/mono_gd/gd_mono_utils.cpp
View File

@ -114,7 +114,7 @@ MonoObject *unmanaged_get_managed(Object *unmanaged) {
// Unsafe refcount increment. The managed instance also counts as a reference. // Unsafe refcount increment. The managed instance also counts as a reference.
// This way if the unmanaged world has no references to our owner // This way if the unmanaged world has no references to our owner
// but the managed instance is alive, the refcount will be 1 instead of 0. // but the managed instance is alive, the refcount will be 1 instead of 0.
// See: godot_icall_Reference_Dtor(MonoObject *p_obj, Object *p_ptr) // See: godot_icall_RefCounted_Dtor(MonoObject *p_obj, Object *p_ptr)
rc->reference(); rc->reference();
CSharpLanguage::get_singleton()->post_unsafe_reference(rc); CSharpLanguage::get_singleton()->post_unsafe_reference(rc);
} }