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

Merge pull request #16804 from Valentactive/fix_mono_template_compiling 

fix template builds with mono
This commit is contained in:
Rémi Verschelde 2018-02-25 10:11:10 +01:00 committed by GitHub
parent 2df206e6a8 3c7d9001bc
commit 08584b7e22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/mono/csharp_script.cpp
View File

@ -1552,7 +1552,6 @@ bool CSharpScript::_update_exports() {
} }
bool CSharpScript::_update_signals() { bool CSharpScript::_update_signals() {
#ifdef TOOLS_ENABLED
if (!valid) if (!valid)
return false; return false;
@ -1583,8 +1582,6 @@ bool CSharpScript::_update_signals() {
} }
return changed; return changed;
#endif
return false;
} }
bool CSharpScript::_get_signal(GDMonoClass *p_class, GDMonoClass *p_delegate, Vector<Argument> &params) { bool CSharpScript::_get_signal(GDMonoClass *p_class, GDMonoClass *p_delegate, Vector<Argument> &params) {
@ -2137,9 +2134,7 @@ void CSharpScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
} }
void CSharpScript::update_signals() { void CSharpScript::update_signals() {
#ifdef TOOLS_ENABLED
_update_signals(); _update_signals();
#endif
} }
Ref<Script> CSharpScript::get_base_script() const { Ref<Script> CSharpScript::get_base_script() const {

6
modules/mono/csharp_script.h
View File

@ -90,15 +90,15 @@ class CSharpScript : public Script {
Variant::Type type; Variant::Type type;
}; };
Map<StringName, Vector<Argument> > _signals;
bool signals_invalidated;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
List<PropertyInfo> exported_members_cache; // members_cache List<PropertyInfo> exported_members_cache; // members_cache
Map<StringName, Variant> exported_members_defval_cache; // member_default_values_cache Map<StringName, Variant> exported_members_defval_cache; // member_default_values_cache
Set<PlaceHolderScriptInstance *> placeholders; Set<PlaceHolderScriptInstance *> placeholders;
bool source_changed_cache; bool source_changed_cache;
bool exports_invalidated; bool exports_invalidated;
Map<StringName, Vector<Argument> > _signals;
bool signals_invalidated;
void _update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames); void _update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames);
virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder); virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
#endif #endif