diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-16 22:44:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-16 22:44:13 +0100 |
| commit | 6cde380cee74a136710006d6d05c5dcccc032a39 (patch) | |
| tree | ba7bc1d19f4f735773714548ba86c16ce8c17c6d /modules/mono/glue | |
| parent | 98caeb635c2e4d48e0d6d6dbd82af183ab83f894 (diff) | |
| parent | 8cbe4a3db49f61992a978d2311455377bb3a9656 (diff) | |
Merge pull request #33603 from neikeq/ばか
Mono/C#: WebAssembly and initial AOT support
Diffstat (limited to 'modules/mono/glue')
| -rw-r--r-- | modules/mono/glue/base_object_glue.cpp | 1 | ||||
| -rw-r--r-- | modules/mono/glue/collections_glue.cpp | 1 | ||||
| -rw-r--r-- | modules/mono/glue/gd_glue.cpp | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/modules/mono/glue/base_object_glue.cpp b/modules/mono/glue/base_object_glue.cpp index 6d85f55b97..2488f78350 100644 --- a/modules/mono/glue/base_object_glue.cpp +++ b/modules/mono/glue/base_object_glue.cpp @@ -36,6 +36,7 @@ #include "core/string_name.h" #include "../csharp_script.h" +#include "../mono_gd/gd_mono_cache.h" #include "../mono_gd/gd_mono_class.h" #include "../mono_gd/gd_mono_internals.h" #include "../mono_gd/gd_mono_utils.h" diff --git a/modules/mono/glue/collections_glue.cpp b/modules/mono/glue/collections_glue.cpp index e67c8b9ad9..bfb7b0f775 100644 --- a/modules/mono/glue/collections_glue.cpp +++ b/modules/mono/glue/collections_glue.cpp @@ -34,6 +34,7 @@ #include <mono/metadata/exception.h> +#include "../mono_gd/gd_mono_cache.h" #include "../mono_gd/gd_mono_class.h" #include "../mono_gd/gd_mono_utils.h" diff --git a/modules/mono/glue/gd_glue.cpp b/modules/mono/glue/gd_glue.cpp index 8b9a1380d8..1381d79e2e 100644 --- a/modules/mono/glue/gd_glue.cpp +++ b/modules/mono/glue/gd_glue.cpp @@ -39,6 +39,7 @@ #include "core/variant.h" #include "core/variant_parser.h" +#include "../mono_gd/gd_mono_cache.h" #include "../mono_gd/gd_mono_utils.h" MonoObject *godot_icall_GD_bytes2var(MonoArray *p_bytes, MonoBoolean p_allow_objects) { @@ -211,7 +212,7 @@ MonoString *godot_icall_GD_var2str(MonoObject *p_var) { } MonoObject *godot_icall_DefaultGodotTaskScheduler() { - return GDMonoUtils::mono_cache.task_scheduler_handle->get_target(); + return GDMonoCache::cached_data.task_scheduler_handle->get_target(); } void godot_register_gd_icalls() { |