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

Fixes building mono release templates 

(cherry picked from commit a77f633161)
This commit is contained in:
NutmegStudio 2020-05-30 12:21:24 +07:00 committed by Rémi Verschelde
parent fdf64b1898
commit 96a3b91eee
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/csharp_script.cpp
View File

@ -2629,7 +2629,9 @@ bool CSharpScript::_get_member_export(IMonoClassMember *p_member, bool p_inspect
return true; return true;
} }
#ifdef TOOLS_ENABLED
MonoObject *attr = p_member->get_attribute(CACHED_CLASS(ExportAttribute)); MonoObject *attr = p_member->get_attribute(CACHED_CLASS(ExportAttribute));
#endif
PropertyHint hint = PROPERTY_HINT_NONE; PropertyHint hint = PROPERTY_HINT_NONE;
String hint_string; String hint_string;

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

@ -425,10 +425,10 @@ void GDMono::initialize_load_assemblies() {
#if defined(TOOLS_ENABLED) #if defined(TOOLS_ENABLED)
bool tool_assemblies_loaded = _load_tools_assemblies(); bool tool_assemblies_loaded = _load_tools_assemblies();
CRASH_COND_MSG(!tool_assemblies_loaded, "Mono: Failed to load '" TOOLS_ASM_NAME "' assemblies."); CRASH_COND_MSG(!tool_assemblies_loaded, "Mono: Failed to load '" TOOLS_ASM_NAME "' assemblies.");
#endif
if (Main::is_project_manager()) if (Main::is_project_manager())
return; return;
#endif
// Load the project's main assembly. This doesn't necessarily need to succeed. // Load the project's main assembly. This doesn't necessarily need to succeed.
// The game may not be using .NET at all, or if the project does use .NET and // The game may not be using .NET at all, or if the project does use .NET and