|
@@ -44,7 +44,6 @@
|
|
#include "core/project_settings.h"
|
|
#include "core/project_settings.h"
|
|
|
|
|
|
#include "../csharp_script.h"
|
|
#include "../csharp_script.h"
|
|
-#include "../glue/cs_glue_version.gen.h"
|
|
|
|
#include "../godotsharp_dirs.h"
|
|
#include "../godotsharp_dirs.h"
|
|
#include "../utils/path_utils.h"
|
|
#include "../utils/path_utils.h"
|
|
#include "gd_mono_class.h"
|
|
#include "gd_mono_class.h"
|
|
@@ -395,23 +394,24 @@ uint64_t get_core_api_hash();
|
|
uint64_t get_editor_api_hash();
|
|
uint64_t get_editor_api_hash();
|
|
#endif
|
|
#endif
|
|
uint32_t get_bindings_version();
|
|
uint32_t get_bindings_version();
|
|
|
|
+uint32_t get_cs_glue_version();
|
|
|
|
|
|
void register_generated_icalls();
|
|
void register_generated_icalls();
|
|
|
|
|
|
#else
|
|
#else
|
|
|
|
|
|
uint64_t get_core_api_hash() {
|
|
uint64_t get_core_api_hash() {
|
|
- CRASH_NOW();
|
|
|
|
GD_UNREACHABLE();
|
|
GD_UNREACHABLE();
|
|
}
|
|
}
|
|
#ifdef TOOLS_ENABLED
|
|
#ifdef TOOLS_ENABLED
|
|
uint64_t get_editor_api_hash() {
|
|
uint64_t get_editor_api_hash() {
|
|
- CRASH_NOW();
|
|
|
|
GD_UNREACHABLE();
|
|
GD_UNREACHABLE();
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
uint32_t get_bindings_version() {
|
|
uint32_t get_bindings_version() {
|
|
- CRASH_NOW();
|
|
|
|
|
|
+ GD_UNREACHABLE();
|
|
|
|
+}
|
|
|
|
+uint32_t get_cs_glue_version() {
|
|
GD_UNREACHABLE();
|
|
GD_UNREACHABLE();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -687,7 +687,7 @@ bool GDMono::_load_core_api_assembly() {
|
|
APIAssembly::Version api_assembly_ver = APIAssembly::Version::get_from_loaded_assembly(core_api_assembly, APIAssembly::API_CORE);
|
|
APIAssembly::Version api_assembly_ver = APIAssembly::Version::get_from_loaded_assembly(core_api_assembly, APIAssembly::API_CORE);
|
|
core_api_assembly_out_of_sync = GodotSharpBindings::get_core_api_hash() != api_assembly_ver.godot_api_hash ||
|
|
core_api_assembly_out_of_sync = GodotSharpBindings::get_core_api_hash() != api_assembly_ver.godot_api_hash ||
|
|
GodotSharpBindings::get_bindings_version() != api_assembly_ver.bindings_version ||
|
|
GodotSharpBindings::get_bindings_version() != api_assembly_ver.bindings_version ||
|
|
- CS_GLUE_VERSION != api_assembly_ver.cs_glue_version;
|
|
|
|
|
|
+ GodotSharpBindings::get_cs_glue_version() != api_assembly_ver.cs_glue_version;
|
|
if (!core_api_assembly_out_of_sync) {
|
|
if (!core_api_assembly_out_of_sync) {
|
|
GDMonoUtils::update_godot_api_cache();
|
|
GDMonoUtils::update_godot_api_cache();
|
|
|
|
|
|
@@ -722,7 +722,7 @@ bool GDMono::_load_editor_api_assembly() {
|
|
APIAssembly::Version api_assembly_ver = APIAssembly::Version::get_from_loaded_assembly(editor_api_assembly, APIAssembly::API_EDITOR);
|
|
APIAssembly::Version api_assembly_ver = APIAssembly::Version::get_from_loaded_assembly(editor_api_assembly, APIAssembly::API_EDITOR);
|
|
editor_api_assembly_out_of_sync = GodotSharpBindings::get_editor_api_hash() != api_assembly_ver.godot_api_hash ||
|
|
editor_api_assembly_out_of_sync = GodotSharpBindings::get_editor_api_hash() != api_assembly_ver.godot_api_hash ||
|
|
GodotSharpBindings::get_bindings_version() != api_assembly_ver.bindings_version ||
|
|
GodotSharpBindings::get_bindings_version() != api_assembly_ver.bindings_version ||
|
|
- CS_GLUE_VERSION != api_assembly_ver.cs_glue_version;
|
|
|
|
|
|
+ GodotSharpBindings::get_cs_glue_version() != api_assembly_ver.cs_glue_version;
|
|
} else {
|
|
} else {
|
|
editor_api_assembly_out_of_sync = false;
|
|
editor_api_assembly_out_of_sync = false;
|
|
}
|
|
}
|