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

Merge pull request #16118 from neikeq/i-dont-know-what-to-write-here-anymore 

Mono: Fix build errors with tools=no and target=release
This commit is contained in:
Rémi Verschelde 2018-01-27 23:29:27 +01:00 committed by GitHub
parent 947abe909d 0c3bbcaa00
commit dcacf36118
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mono/csharp_script.cpp
View File

@ -447,6 +447,7 @@ String CSharpLanguage::_get_indentation() const {
Vector<ScriptLanguage::StackInfo> CSharpLanguage::debug_get_current_stack_info() { Vector<ScriptLanguage::StackInfo> CSharpLanguage::debug_get_current_stack_info() {
#ifdef DEBUG_ENABLED
// Printing an error here will result in endless recursion, so we must be careful // Printing an error here will result in endless recursion, so we must be careful
if (!gdmono->is_runtime_initialized() || !GDMono::get_singleton()->get_api_assembly() || !GDMonoUtils::mono_cache.corlib_cache_updated) if (!gdmono->is_runtime_initialized() || !GDMono::get_singleton()->get_api_assembly() || !GDMonoUtils::mono_cache.corlib_cache_updated)
@ -463,8 +464,12 @@ Vector<ScriptLanguage::StackInfo> CSharpLanguage::debug_get_current_stack_info()
si = stack_trace_get_info(stack_trace); si = stack_trace_get_info(stack_trace);
return si; return si;
#else
return Vector<StackInfo>();
#endif
} }
#ifdef DEBUG_ENABLED
Vector<ScriptLanguage::StackInfo> CSharpLanguage::stack_trace_get_info(MonoObject *p_stack_trace) { Vector<ScriptLanguage::StackInfo> CSharpLanguage::stack_trace_get_info(MonoObject *p_stack_trace) {
// Printing an error here could result in endless recursion, so we must be careful // Printing an error here could result in endless recursion, so we must be careful
@ -514,6 +519,7 @@ Vector<ScriptLanguage::StackInfo> CSharpLanguage::stack_trace_get_info(MonoObjec
return si; return si;
} }
#endif
void CSharpLanguage::frame() { void CSharpLanguage::frame() {
@ -1546,6 +1552,7 @@ bool CSharpScript::_update_exports() {
return false; return false;
} }
#ifdef TOOLS_ENABLED
bool CSharpScript::_get_member_export(GDMonoClass *p_class, GDMonoClassMember *p_member, PropertyInfo &r_prop_info, bool &r_exported) { bool CSharpScript::_get_member_export(GDMonoClass *p_class, GDMonoClassMember *p_member, PropertyInfo &r_prop_info, bool &r_exported) {
StringName name = p_member->get_name(); StringName name = p_member->get_name();
@ -1616,6 +1623,7 @@ bool CSharpScript::_get_member_export(GDMonoClass *p_class, GDMonoClassMember *p
return true; return true;
} }
#endif
void CSharpScript::_clear() { void CSharpScript::_clear() {

4
modules/mono/csharp_script.h
View File

@ -105,7 +105,9 @@ class CSharpScript : public Script {
void _clear(); void _clear();
bool _update_exports(); bool _update_exports();
#ifdef TOOLS_ENABLED
bool _get_member_export(GDMonoClass *p_class, GDMonoClassMember *p_member, PropertyInfo &r_prop_info, bool &r_exported); bool _get_member_export(GDMonoClass *p_class, GDMonoClassMember *p_member, PropertyInfo &r_prop_info, bool &r_exported);
#endif
CSharpInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Variant::CallError &r_error); CSharpInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Variant::CallError &r_error);
Variant _new(const Variant **p_args, int p_argcount, Variant::CallError &r_error); Variant _new(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
@ -335,7 +337,9 @@ public:
virtual void *alloc_instance_binding_data(Object *p_object); virtual void *alloc_instance_binding_data(Object *p_object);
virtual void free_instance_binding_data(void *p_data); virtual void free_instance_binding_data(void *p_data);
#ifdef DEBUG_ENABLED
Vector<StackInfo> stack_trace_get_info(MonoObject *p_stack_trace); Vector<StackInfo> stack_trace_get_info(MonoObject *p_stack_trace);
#endif
CSharpLanguage(); CSharpLanguage();
~CSharpLanguage(); ~CSharpLanguage();