Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't define NO_EDITOR_SPLASH in export templates #91866

Merged
merged 1 commit into from
May 13, 2024
Merged

Don't define NO_EDITOR_SPLASH in export templates #91866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
programneer marked this conversation as resolved.
Show resolved Hide resolved
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"])
Expand Down
2 changes: 1 addition & 1 deletion main/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion main/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading