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

Merge pull request #82985 from jackwilsdon/build-without-gdscript

Browse source 
Fix building without GDScript
This commit is contained in:
Rémi Verschelde 2023-10-09 15:35:56 +02:00
commit 0b11010cf0
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main/main.cpp
View file

@ -1542,7 +1542,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
OS::get_singleton()->print("Missing <path> argument for --benchmark-file <path>.\n"); OS::get_singleton()->print("Missing <path> argument for --benchmark-file <path>.\n");
goto error; 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") { } else if (I->get() == "--lsp-port") {
if (I->next()) { if (I->next()) {
int port_override = I->next()->get().to_int(); 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 <port> argument for --lsp-port <port>.\n"); OS::get_singleton()->print("Missing <port> argument for --lsp-port <port>.\n");
goto error; goto error;
} }
#endif // TOOLS_ENABLED && !GDSCRIPT_NO_LSP #endif // TOOLS_ENABLED && MODULE_GDSCRIPT_ENABLED && !GDSCRIPT_NO_LSP
} else if (I->get() == "--" || I->get() == "++") { } else if (I->get() == "--" || I->get() == "++") {
adding_user_args = true; adding_user_args = true;
} else { } else {
@ -2857,7 +2857,11 @@ bool Main::start() {
} }
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#ifdef MODULE_GDSCRIPT_ENABLED
if (!doc_tool_path.is_empty() && gdscript_docs_path.is_empty()) { 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 // Needed to instance editor-only classes for their default values
Engine::get_singleton()->set_editor_hint(true); Engine::get_singleton()->set_editor_hint(true);