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

Merge pull request #30710 from neikeq/issue-30526 

Fix mono module build errors for release templates
This commit is contained in:
Ignacio Roldán Etcheverry 2019-07-20 16:20:49 +02:00 committed by GitHub
parent 60efd67034 ec679dfffa
commit 4379395892
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mono/class_db_api_json.cpp
View File

@ -30,6 +30,8 @@
#include "class_db_api_json.h" #include "class_db_api_json.h"
#ifdef DEBUG_METHODS_ENABLED
#include "core/io/json.h" #include "core/io/json.h"
#include "core/os/file_access.h" #include "core/os/file_access.h"
#include "core/project_settings.h" #include "core/project_settings.h"
@ -240,3 +242,5 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
print_line(String() + "ClassDB API JSON written to: " + ProjectSettings::get_singleton()->globalize_path(p_output_file)); print_line(String() + "ClassDB API JSON written to: " + ProjectSettings::get_singleton()->globalize_path(p_output_file));
} }
#endif // DEBUG_METHODS_ENABLED

7
modules/mono/class_db_api_json.h
View File

@ -31,9 +31,16 @@
#ifndef CLASS_DB_API_JSON_H #ifndef CLASS_DB_API_JSON_H
#define CLASS_DB_API_JSON_H #define CLASS_DB_API_JSON_H
// 'core/method_bind.h' defines DEBUG_METHODS_ENABLED, but it looks like we
// cannot include it here. That's why we include it through 'core/class_db.h'.
#include "core/class_db.h" #include "core/class_db.h"
#ifdef DEBUG_METHODS_ENABLED
#include "core/ustring.h" #include "core/ustring.h"
void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api); void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api);
#endif // DEBUG_METHODS_ENABLED
#endif // CLASS_DB_API_JSON_H #endif // CLASS_DB_API_JSON_H

7
modules/mono/mono_gd/gd_mono.cpp
View File

@ -719,6 +719,7 @@ bool GDMono::_try_load_api_assemblies() {
void GDMono::_load_api_assemblies() { void GDMono::_load_api_assemblies() {
if (!_try_load_api_assemblies()) { if (!_try_load_api_assemblies()) {
#ifdef TOOLS_ENABLED
// The API assemblies are out of sync. Fine, try one more time, but this time // The API assemblies are out of sync. Fine, try one more time, but this time
// update them from the prebuilt assemblies directory before trying to load them. // update them from the prebuilt assemblies directory before trying to load them.
@ -752,11 +753,9 @@ void GDMono::_load_api_assemblies() {
ERR_PRINT("The loaded assembly '" CORE_API_ASSEMBLY_NAME "' is in sync, but the cache update failed"); ERR_PRINT("The loaded assembly '" CORE_API_ASSEMBLY_NAME "' is in sync, but the cache update failed");
} }
#ifdef TOOLS_ENABLED
if (editor_api_assembly_out_of_sync) { if (editor_api_assembly_out_of_sync) {
ERR_PRINT("The assembly '" EDITOR_API_ASSEMBLY_NAME "' is out of sync"); ERR_PRINT("The assembly '" EDITOR_API_ASSEMBLY_NAME "' is out of sync");
} }
#endif
CRASH_NOW(); CRASH_NOW();
} else { } else {
@ -764,6 +763,10 @@ void GDMono::_load_api_assemblies() {
CRASH_NOW(); CRASH_NOW();
} }
} }
#else
ERR_EXPLAIN("Failed to load one of the API assemblies");
CRASH_NOW();
#endif
} }
} }