Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 14:12:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #74980 from YuriSizov/build-err-without-required-editor-modules

Browse Source 
Err when trying to build the editor without its required modules
This commit is contained in:
Rémi Verschelde 2023-04-26 11:42:07 +02:00
commit c16821e71b
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SConstruct
View File

@ -831,6 +831,15 @@ if selected_platform in platform_list:
env.module_list = modules_enabled env.module_list = modules_enabled
methods.sort_module_list(env) 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) methods.generate_version_header(env.module_version_string)
env["PROGSUFFIX_WRAP"] = suffix + env.module_version_string + ".console" + env["PROGSUFFIX"] 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["disable_3d"]:
if env.editor_build: 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) Exit(255)
else: else:
env.Append(CPPDEFINES=["_3D_DISABLED"]) env.Append(CPPDEFINES=["_3D_DISABLED"])
@ -859,7 +868,7 @@ if selected_platform in platform_list:
if env.editor_build: if env.editor_build:
print( print(
"Build option 'disable_advanced_gui=yes' cannot be used for editor builds, " "Build option 'disable_advanced_gui=yes' cannot be used for editor builds, "
"but only for export templates." "only for export template builds."
) )
Exit(255) Exit(255)
else: else: