Skip to content

godot
godot
Unverified Commit a8787d1a by Rémi Verschelde Committed by GitHub
Options

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

Fix building mono release templates
parents 20a6fcd3 a77f6331
Showing with 3 additions and 1 deletion
modules/mono/csharp_script.cpp
...@@ -2688,7 +2688,9 @@ bool CSharpScript::_get_member_export(IMonoClassMember *p_member, bool p_inspect ...@@ -2688,7 +2688,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;
......
modules/mono/mono_gd/gd_mono.cpp
...@@ -422,10 +422,10 @@ void GDMono::initialize_load_assemblies() { ...@@ -422,10 +422,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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment