diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-25 10:11:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 10:11:10 +0100 |
| commit | 08584b7e2215c852b80dc143cf712ccc73f9cacb (patch) | |
| tree | 7e8eb213889f1762cb196f1a5a9aa3db30400e4a /modules | |
| parent | 2df206e6a80013ee617c0f8bdbc6e1ca1134f897 (diff) | |
| parent | 3c7d9001bc9591368d743e9bd6cc29a74c7bddd5 (diff) | |
Merge pull request #16804 from Valentactive/fix_mono_template_compiling
fix template builds with mono
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/csharp_script.cpp | 5 | ||||
| -rw-r--r-- | modules/mono/csharp_script.h | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index b0854658ce..6287e675d8 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -1552,7 +1552,6 @@ bool CSharpScript::_update_exports() { } bool CSharpScript::_update_signals() { -#ifdef TOOLS_ENABLED if (!valid) return false; @@ -1583,8 +1582,6 @@ bool CSharpScript::_update_signals() { } return changed; -#endif - return false; } bool CSharpScript::_get_signal(GDMonoClass *p_class, GDMonoClass *p_delegate, Vector<Argument> ¶ms) { @@ -2137,9 +2134,7 @@ void CSharpScript::get_script_signal_list(List<MethodInfo> *r_signals) const { } void CSharpScript::update_signals() { -#ifdef TOOLS_ENABLED _update_signals(); -#endif } Ref<Script> CSharpScript::get_base_script() const { diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h index ffb1d2e0f4..1f609627de 100644 --- a/modules/mono/csharp_script.h +++ b/modules/mono/csharp_script.h @@ -90,15 +90,15 @@ class CSharpScript : public Script { Variant::Type type; }; + Map<StringName, Vector<Argument> > _signals; + bool signals_invalidated; + #ifdef TOOLS_ENABLED List<PropertyInfo> exported_members_cache; // members_cache Map<StringName, Variant> exported_members_defval_cache; // member_default_values_cache Set<PlaceHolderScriptInstance *> placeholders; bool source_changed_cache; bool exports_invalidated; - Map<StringName, Vector<Argument> > _signals; - bool signals_invalidated; - void _update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames); virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder); #endif |