Переглянути джерело

[3.x] Don't define NO_EDITOR_SPLASH in export templates

Programneer 1 рік тому
батько
коміт
ffb2038903
3 змінених файлів з 8 додано та 7 видалено
  1. 6 5
      SConstruct
  2. 1 1
      main/SCsub
  3. 1 1
      main/main.cpp

+ 6 - 5
SConstruct

@@ -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():
-    # Force disabling editor splash if missing.
-    env_base["no_editor_splash"] = True
-if env_base["no_editor_splash"]:
-    env_base.Append(CPPDEFINES=["NO_EDITOR_SPLASH"])
+if env_base["tools"]:
+    if not env_base.File("#main/splash_editor.png").exists():
+        # Force disabling editor splash if missing.
+        env_base["no_editor_splash"] = True
+    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"])

+ 1 - 1
main/SCsub

@@ -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)

+ 1 - 1
main/main.cpp

@@ -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