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

Merge pull request #91906 from programneer/3.x-dont-splash-my-editor

Browse source 
[3.x] Don't define `NO_EDITOR_SPLASH` in export templates
This commit is contained in:
Rémi Verschelde 2024-05-16 09:25:54 +02:00
commit 41dcf218e6
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SConstruct
View file

@ -363,11 +363,12 @@ if methods.get_cmdline_bool("fast_unsafe", env_base["target"] == "debug"):
if env_base["use_precise_math_checks"]: if env_base["use_precise_math_checks"]:
env_base.Append(CPPDEFINES=["PRECISE_MATH_CHECKS"]) env_base.Append(CPPDEFINES=["PRECISE_MATH_CHECKS"])
if not env_base.File("#main/splash_editor.png").exists(): if env_base["tools"]:
# Force disabling editor splash if missing. if not env_base.File("#main/splash_editor.png").exists():
env_base["no_editor_splash"] = True # Force disabling editor splash if missing.
if env_base["no_editor_splash"]: env_base["no_editor_splash"] = True
env_base.Append(CPPDEFINES=["NO_EDITOR_SPLASH"]) if env_base["no_editor_splash"]:
env_base.Append(CPPDEFINES=["NO_EDITOR_SPLASH"])
if not env_base["deprecated"]: if not env_base["deprecated"]:
env_base.Append(CPPDEFINES=["DISABLE_DEPRECATED"]) env_base.Append(CPPDEFINES=["DISABLE_DEPRECATED"])

2
main/SCsub
View file

@ -23,7 +23,7 @@ env.add_source_files(env.main_sources, gensource)
env.Depends("#main/splash.gen.h", "#main/splash.png") env.Depends("#main/splash.gen.h", "#main/splash.png")
env.CommandNoCache("#main/splash.gen.h", "#main/splash.png", run_in_subprocess(main_builders.make_splash)) env.CommandNoCache("#main/splash.gen.h", "#main/splash.png", run_in_subprocess(main_builders.make_splash))
if not env["no_editor_splash"]: if env["tools"] and not env["no_editor_splash"]:
env.Depends("#main/splash_editor.gen.h", "#main/splash_editor.png") env.Depends("#main/splash_editor.gen.h", "#main/splash_editor.png")
env.CommandNoCache( env.CommandNoCache(
"#main/splash_editor.gen.h", "#main/splash_editor.png", run_in_subprocess(main_builders.make_splash_editor) "#main/splash_editor.gen.h", "#main/splash_editor.png", run_in_subprocess(main_builders.make_splash_editor)

2
main/main.cpp
View file

@ -81,7 +81,7 @@
#include "editor/progress_dialog.h" #include "editor/progress_dialog.h"
#include "editor/project_manager.h" #include "editor/project_manager.h"
#include "editor/script_editor_debugger.h" #include "editor/script_editor_debugger.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
#endif #endif