asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6472 from vnen/fix-gds-nontools

Browse source 
Fix build for templates
This commit is contained in:
Rémi Verschelde 2016-09-13 07:41:31 +02:00 committed by GitHub
commit af355364b2
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/gdscript/gd_editor.cpp
View file

@ -2525,6 +2525,8 @@ void GDScriptLanguage::auto_indent_code(String& p_code,int p_from_line,int p_to_
} }
#ifdef TOOLS_ENABLED
Error GDScriptLanguage::lookup_code(const String& p_code, const String& p_symbol,const String& p_base_path, Object*p_owner,LookupResult& r_result) { Error GDScriptLanguage::lookup_code(const String& p_code, const String& p_symbol,const String& p_base_path, Object*p_owner,LookupResult& r_result) {
@ -2959,3 +2961,5 @@ Error GDScriptLanguage::lookup_code(const String& p_code, const String& p_symbol
return ERR_CANT_RESOLVE; return ERR_CANT_RESOLVE;
} }
#endif

2
modules/gdscript/gd_script.h
View file

@ -408,7 +408,9 @@ public:
virtual int find_function(const String& p_function,const String& p_code) const; virtual int find_function(const String& p_function,const String& p_code) const;
virtual String make_function(const String& p_class,const String& p_name,const StringArray& p_args) const; virtual String make_function(const String& p_class,const String& p_name,const StringArray& p_args) const;
virtual Error complete_code(const String& p_code, const String& p_base_path, Object*p_owner,List<String>* r_options,String& r_call_hint); virtual Error complete_code(const String& p_code, const String& p_base_path, Object*p_owner,List<String>* r_options,String& r_call_hint);
#ifdef TOOLS_ENABLED
virtual Error lookup_code(const String& p_code, const String& p_symbol, const String& p_base_path, Object*p_owner, LookupResult& r_result); virtual Error lookup_code(const String& p_code, const String& p_symbol, const String& p_base_path, Object*p_owner, LookupResult& r_result);
#endif
virtual void auto_indent_code(String& p_code,int p_from_line,int p_to_line) const; virtual void auto_indent_code(String& p_code,int p_from_line,int p_to_line) const;
virtual void add_global_constant(const StringName& p_variable,const Variant& p_value); virtual void add_global_constant(const StringName& p_variable,const Variant& p_value);