Browse Source

Merge pull request #39159 from NutmegStudio/fix-mono-templates

Fix building mono release templates
Rémi Verschelde 5 years ago
parent
commit
a8787d1ae5
2 changed files with 3 additions and 1 deletions
  1. 2 0
      modules/mono/csharp_script.cpp
  2. 1 1
      modules/mono/mono_gd/gd_mono.cpp

+ 2 - 0
modules/mono/csharp_script.cpp

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

+ 1 - 1
modules/mono/mono_gd/gd_mono.cpp

@@ -422,10 +422,10 @@ void GDMono::initialize_load_assemblies() {
 #if defined(TOOLS_ENABLED)
 	bool tool_assemblies_loaded = _load_tools_assemblies();
 	CRASH_COND_MSG(!tool_assemblies_loaded, "Mono: Failed to load '" TOOLS_ASM_NAME "' assemblies.");
-#endif
 
 	if (Main::is_project_manager())
 		return;
+#endif
 
 	// 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