diff options
| author | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2019-07-08 15:22:51 +0200 |
|---|---|---|
| committer | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2019-07-08 18:07:20 +0200 |
| commit | 069af23bdbd2d8b3bca5376c60d654ebf8ec08a3 (patch) | |
| tree | 74015830709d02a25bfdb24cc797e8a7106087db /modules/mono/csharp_script.cpp | |
| parent | dd22cc7527049e6fa4d1a095a8fcd4ebffeaabd4 (diff) | |
| download | redot-engine-069af23bdbd2d8b3bca5376c60d654ebf8ec08a3.tar.gz | |
Mono: Fix build errors with tools=no
Diffstat (limited to 'modules/mono/csharp_script.cpp')
| -rw-r--r-- | modules/mono/csharp_script.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 06a5c65d3c..7492816f18 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -876,13 +876,17 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { const StringName &class_namespace = script->tied_class_namespace_for_reload; const StringName &class_name = script->tied_class_name_for_reload; GDMonoAssembly *project_assembly = gdmono->get_project_assembly(); - GDMonoAssembly *tools_assembly = gdmono->get_tools_assembly(); // Search in project and tools assemblies first as those are the most likely to have the class GDMonoClass *script_class = (project_assembly ? project_assembly->get_class(class_namespace, class_name) : NULL); + +#ifdef TOOLS_ENABLED if (!script_class) { + GDMonoAssembly *tools_assembly = gdmono->get_tools_assembly(); script_class = (tools_assembly ? tools_assembly->get_class(class_namespace, class_name) : NULL); } +#endif + if (!script_class) { script_class = gdmono->get_class(class_namespace, class_name); } @@ -1202,7 +1206,9 @@ CSharpLanguage::CSharpLanguage() { scripts_metadata_invalidated = true; +#ifdef TOOLS_ENABLED godotsharp_editor = NULL; +#endif } CSharpLanguage::~CSharpLanguage() { @@ -2143,7 +2149,6 @@ void CSharpScript::_update_exports_values(Map<StringName, Variant> &values, List propnames.push_back(E->get()); } } -#endif void CSharpScript::_update_member_info_no_exports() { @@ -2190,6 +2195,7 @@ void CSharpScript::_update_member_info_no_exports() { } } } +#endif bool CSharpScript::_update_exports() { @@ -2743,7 +2749,9 @@ void CSharpScript::initialize_for_managed_type(Ref<CSharpScript> p_script, GDMon } p_script->load_script_signals(p_script->script_class, p_script->native); +#ifdef TOOLS_ENABLED p_script->_update_member_info_no_exports(); +#endif } bool CSharpScript::can_instance() const { |