diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-29 08:37:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-29 08:37:40 +0200 |
| commit | b97169740eeffc6a89a7a3fbca7f0dd851ea7130 (patch) | |
| tree | 791e4ac6d1935966d4863366dc70101b5471cf3e /modules/gdscript/SCsub | |
| parent | ebbf63a87c574cb8633b3005ad3f55292dbfeea2 (diff) | |
| parent | b994124df3546b351f673304ad227195298b102c (diff) | |
| download | redot-engine-b97169740eeffc6a89a7a3fbca7f0dd851ea7130.tar.gz | |
Merge pull request #31741 from akien-mga/lsp-requires-websocket-jsonrpc
GDScript: Disable LSP if either jsonrpc or websocket are disabled
Diffstat (limited to 'modules/gdscript/SCsub')
| -rw-r--r-- | modules/gdscript/SCsub | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/modules/gdscript/SCsub b/modules/gdscript/SCsub index 6285e6bb54..74e653ce43 100644 --- a/modules/gdscript/SCsub +++ b/modules/gdscript/SCsub @@ -8,5 +8,12 @@ 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") - env_gdscript.add_source_files(env.modules_sources, "./language_server/*.cpp") + env_gdscript.add_source_files(env.modules_sources, "./editor/*.cpp") + + # Those two modules are required for the language server protocol + if env['module_jsonrpc_enabled'] and env['module_websocket_enabled']: + env_gdscript.add_source_files(env.modules_sources, "./language_server/*.cpp") + else: + # Using a define in the disabled case, to avoid having an extra define + # in regular builds where all modules are enabled. + env_gdscript.Append(CPPDEFINES=['GDSCRIPT_NO_LSP']) |