diff options
| -rw-r--r-- | SConstruct | 17 | ||||
| -rw-r--r-- | main/SCsub | 2 | ||||
| -rw-r--r-- | main/main.cpp | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index cfedcc84ed..512c35f207 100644 --- a/SConstruct +++ b/SConstruct @@ -492,14 +492,15 @@ if methods.get_cmdline_bool("fast_unsafe", env.dev_build): if env["use_precise_math_checks"]: env.Append(CPPDEFINES=["PRECISE_MATH_CHECKS"]) -if env.editor_build and env["engine_update_check"]: - env.Append(CPPDEFINES=["ENGINE_UPDATE_CHECK_ENABLED"]) - -if not env.File("#main/splash_editor.png").exists(): - # Force disabling editor splash if missing. - env["no_editor_splash"] = True -if env["no_editor_splash"]: - env.Append(CPPDEFINES=["NO_EDITOR_SPLASH"]) +if env.editor_build: + if env["engine_update_check"]: + env.Append(CPPDEFINES=["ENGINE_UPDATE_CHECK_ENABLED"]) + + if not env.File("#main/splash_editor.png").exists(): + # Force disabling editor splash if missing. + env["no_editor_splash"] = True + if env["no_editor_splash"]: + env.Append(CPPDEFINES=["NO_EDITOR_SPLASH"]) if not env["deprecated"]: env.Append(CPPDEFINES=["DISABLE_DEPRECATED"]) diff --git a/main/SCsub b/main/SCsub index 3e7680bf89..27b746a937 100644 --- a/main/SCsub +++ b/main/SCsub @@ -20,7 +20,7 @@ env_main.CommandNoCache( env.Run(main_builders.make_splash), ) -if not env_main["no_editor_splash"]: +if env_main.editor_build and not env_main["no_editor_splash"]: env_main.Depends("#main/splash_editor.gen.h", "#main/splash_editor.png") env_main.CommandNoCache( "#main/splash_editor.gen.h", diff --git a/main/main.cpp b/main/main.cpp index 1ba336221f..bcd7d8df22 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -104,7 +104,7 @@ #include "editor/project_manager.h" #include "editor/register_editor_types.h" -#ifndef NO_EDITOR_SPLASH +#if defined(TOOLS_ENABLED) && !defined(NO_EDITOR_SPLASH) #include "main/splash_editor.gen.h" #endif |