summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-04-26 11:42:07 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-04-26 11:42:07 +0200
commitc16821e71b39c78ad2b0427c5f45c862c6d78328 (patch)
tree6a21bb033f37c95737c8da0fe516789ff2331126
parent51951a59d6c2d7ba9ecc8e48888b099429219300 (diff)
parenta14519426871341890b4257a64914b2761f8b055 (diff)
downloadredot-engine-c16821e71b39c78ad2b0427c5f45c862c6d78328.tar.gz
Merge pull request #74980 from YuriSizov/build-err-without-required-editor-modules
Err when trying to build the editor without its required modules
-rw-r--r--SConstruct13
1 files changed, 11 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index f5efc58585..e5421b7887 100644
--- a/SConstruct
+++ b/SConstruct
@@ -831,6 +831,15 @@ if selected_platform in platform_list:
env.module_list = modules_enabled
methods.sort_module_list(env)
+ if env.editor_build:
+ # Add editor-specific dependencies to the dependency graph.
+ env.module_add_dependencies("editor", ["freetype", "svg"])
+
+ # And check if they are met.
+ if not env.module_check_dependencies("editor"):
+ print("Not all modules required by editor builds are enabled.")
+ Exit(255)
+
methods.generate_version_header(env.module_version_string)
env["PROGSUFFIX_WRAP"] = suffix + env.module_version_string + ".console" + env["PROGSUFFIX"]
@@ -851,7 +860,7 @@ if selected_platform in platform_list:
if env["disable_3d"]:
if env.editor_build:
- print("Build option 'disable_3d=yes' cannot be used for editor builds, but only for export templates.")
+ print("Build option 'disable_3d=yes' cannot be used for editor builds, only for export template builds.")
Exit(255)
else:
env.Append(CPPDEFINES=["_3D_DISABLED"])
@@ -859,7 +868,7 @@ if selected_platform in platform_list:
if env.editor_build:
print(
"Build option 'disable_advanced_gui=yes' cannot be used for editor builds, "
- "but only for export templates."
+ "only for export template builds."
)
Exit(255)
else: