From 22b00e392e3a98a2cff1f07432720dac87323783 Mon Sep 17 00:00:00 2001 From: Jack Wilsdon Date: Sun, 8 Oct 2023 01:29:04 +0100 Subject: [PATCH] Fix building without GDScript Fixes #82231 --- main/main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index 8e217575c12..2684012a8d1 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1542,7 +1542,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph OS::get_singleton()->print("Missing argument for --benchmark-file .\n"); goto error; } -#if defined(TOOLS_ENABLED) && !defined(GDSCRIPT_NO_LSP) +#if defined(TOOLS_ENABLED) && defined(MODULE_GDSCRIPT_ENABLED) && !defined(GDSCRIPT_NO_LSP) } else if (I->get() == "--lsp-port") { if (I->next()) { int port_override = I->next()->get().to_int(); @@ -1556,7 +1556,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph OS::get_singleton()->print("Missing argument for --lsp-port .\n"); goto error; } -#endif // TOOLS_ENABLED && !GDSCRIPT_NO_LSP +#endif // TOOLS_ENABLED && MODULE_GDSCRIPT_ENABLED && !GDSCRIPT_NO_LSP } else if (I->get() == "--" || I->get() == "++") { adding_user_args = true; } else { @@ -2857,7 +2857,11 @@ bool Main::start() { } #ifdef TOOLS_ENABLED +#ifdef MODULE_GDSCRIPT_ENABLED if (!doc_tool_path.is_empty() && gdscript_docs_path.is_empty()) { +#else + if (!doc_tool_path.is_empty()) { +#endif // Needed to instance editor-only classes for their default values Engine::get_singleton()->set_editor_hint(true);