godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91866 from programneer/dont-splash-my-editor 

Don't define `NO_EDITOR_SPLASH` in export templates
This commit is contained in:
Rémi Verschelde 2024-05-13 12:05:56 +02:00
parent 9cfbd6d75f efaba30116
commit c5395d3ce2
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SConstruct
View File

@ -484,13 +484,14 @@ if methods.get_cmdline_bool("fast_unsafe", env.dev_build):
if env["use_precise_math_checks"]: if env["use_precise_math_checks"]:
env.Append(CPPDEFINES=["PRECISE_MATH_CHECKS"]) env.Append(CPPDEFINES=["PRECISE_MATH_CHECKS"])
if env.editor_build and env["engine_update_check"]: if env.editor_build:
if env["engine_update_check"]:
env.Append(CPPDEFINES=["ENGINE_UPDATE_CHECK_ENABLED"]) env.Append(CPPDEFINES=["ENGINE_UPDATE_CHECK_ENABLED"])
if not env.File("#main/splash_editor.png").exists(): if not env.File("#main/splash_editor.png").exists():
# Force disabling editor splash if missing. # Force disabling editor splash if missing.
env["no_editor_splash"] = True env["no_editor_splash"] = True
if env["no_editor_splash"]: if env["no_editor_splash"]:
env.Append(CPPDEFINES=["NO_EDITOR_SPLASH"]) env.Append(CPPDEFINES=["NO_EDITOR_SPLASH"])
if not env["deprecated"]: if not env["deprecated"]:

2
main/SCsub
View File

@ -20,7 +20,7 @@ env_main.CommandNoCache(
env.Run(main_builders.make_splash), 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.Depends("#main/splash_editor.gen.h", "#main/splash_editor.png")
env_main.CommandNoCache( env_main.CommandNoCache(
"#main/splash_editor.gen.h", "#main/splash_editor.gen.h",

2
main/main.cpp
View File

@ -104,7 +104,7 @@
#include "editor/project_manager.h" #include "editor/project_manager.h"
#include "editor/register_editor_types.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" #include "main/splash_editor.gen.h"
#endif #endif