From c3d93edf3d4203da332fc2d4feb439eb35280309 Mon Sep 17 00:00:00 2001 From: Paulb23 Date: Fri, 20 Apr 2018 20:44:07 +0100 Subject: [PATCH] Exclude GDScriptSyntaxHighlighter from non-tool builds --- modules/gdscript/SCsub | 3 +++ modules/gdscript/{ => editor}/gdscript_highlighter.cpp | 0 modules/gdscript/{ => editor}/gdscript_highlighter.h | 0 modules/gdscript/register_types.cpp | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) rename modules/gdscript/{ => editor}/gdscript_highlighter.cpp (100%) rename modules/gdscript/{ => editor}/gdscript_highlighter.h (100%) diff --git a/modules/gdscript/SCsub b/modules/gdscript/SCsub index 13870170a5..73f09f1659 100644 --- a/modules/gdscript/SCsub +++ b/modules/gdscript/SCsub @@ -7,4 +7,7 @@ env_gdscript = env_modules.Clone() env_gdscript.add_source_files(env.modules_sources, "*.cpp") +if env['tools']: + env_gdscript.add_source_files(env.modules_sources, "./editor/*.cpp") + Export('env') diff --git a/modules/gdscript/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp similarity index 100% rename from modules/gdscript/gdscript_highlighter.cpp rename to modules/gdscript/editor/gdscript_highlighter.cpp diff --git a/modules/gdscript/gdscript_highlighter.h b/modules/gdscript/editor/gdscript_highlighter.h similarity index 100% rename from modules/gdscript/gdscript_highlighter.h rename to modules/gdscript/editor/gdscript_highlighter.h diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp index 85c94c3596..422223370b 100644 --- a/modules/gdscript/register_types.cpp +++ b/modules/gdscript/register_types.cpp @@ -30,8 +30,8 @@ #include "register_types.h" +#include "editor/gdscript_highlighter.h" #include "gdscript.h" -#include "gdscript_highlighter.h" #include "gdscript_tokenizer.h" #include "io/file_access_encrypted.h" #include "io/resource_loader.h"