maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #32401 from neikeq/Kisaama!

Browse source 
Mono: Don't compare API hashes on release builds
This commit is contained in:
Ignacio Roldán Etcheverry 2019-09-28 03:31:37 +02:00 committed by GitHub
parent 7a67ae01a4 1509890dbc
commit 763a4d8402
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/mono/editor/bindings_generator.cpp
View file

@ -30,7 +30,7 @@
#include "bindings_generator.h"
#ifdef DEBUG_METHODS_ENABLED
#if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
#include "core/engine.h"
#include "core/global_constants.h"

2
modules/mono/editor/bindings_generator.h
View file

@ -36,7 +36,7 @@
#include "editor/doc/doc_data.h"
#include "editor/editor_help.h"
#ifdef DEBUG_METHODS_ENABLED
#if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
#include "core/ustring.h"

3
modules/mono/mono_gd/gd_mono.cpp
View file

@ -430,8 +430,8 @@ void GDMono::_register_internal_calls() {
}
void GDMono::_initialize_and_check_api_hashes() {
#ifdef MONO_GLUE_ENABLED
#ifdef DEBUG_METHODS_ENABLED
if (get_api_core_hash() != GodotSharpBindings::get_core_api_hash()) {
ERR_PRINT("Mono: Core API hash mismatch.");
}
@ -441,6 +441,7 @@ void GDMono::_initialize_and_check_api_hashes() {
ERR_PRINT("Mono: Editor API hash mismatch.");
}
#endif // TOOLS_ENABLED
#endif // DEBUG_METHODS_ENABLED
#endif // MONO_GLUE_ENABLED
}

4
modules/mono/mono_gd/gd_mono.h
View file

@ -151,6 +151,7 @@ protected:
static GDMono *singleton;
public:
#ifdef DEBUG_METHODS_ENABLED
uint64_t get_api_core_hash() {
if (api_core_hash == 0)
api_core_hash = ClassDB::get_api_hash(ClassDB::API_CORE);
@ -162,7 +163,8 @@ public:
api_editor_hash = ClassDB::get_api_hash(ClassDB::API_EDITOR);
return api_editor_hash;
}
#endif
#endif // TOOLS_ENABLED
#endif // DEBUG_METHODS_ENABLED
#ifdef TOOLS_ENABLED
bool copy_prebuilt_api_assembly(APIAssembly::Type p_api_type, const String &p_config);