diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-09-13 07:41:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 07:41:31 +0200 |
| commit | af355364b2973405aae3b7dd3748ebdfa123fdce (patch) | |
| tree | 03810f22b90e99a0b80cab44ea325217a0188691 | |
| parent | 291e9858828cc7007700ac8b65179a32f9a80fe5 (diff) | |
| parent | 5ef64aae58ffb9b66baba00f746413fc92ac980d (diff) | |
Merge pull request #6472 from vnen/fix-gds-nontools
Fix build for templates
| -rw-r--r-- | modules/gdscript/gd_editor.cpp | 4 | ||||
| -rw-r--r-- | modules/gdscript/gd_script.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index 48b58c16b8..c3e59836a2 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -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) { @@ -2959,3 +2961,5 @@ Error GDScriptLanguage::lookup_code(const String& p_code, const String& p_symbol return ERR_CANT_RESOLVE; } + +#endif diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h index cb20361068..051e80634f 100644 --- a/modules/gdscript/gd_script.h +++ b/modules/gdscript/gd_script.h @@ -408,7 +408,9 @@ public: 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 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); +#endif 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); |