godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92041 from akien-mga/scons-restore-compat-pre-4.0.0 

SCons: Restore compatibility with SCons < 4.0.0
This commit is contained in:
Rémi Verschelde 2024-05-17 11:14:18 +02:00
parent 375e5be340 856fbc68b3
commit 5b341621e6
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -365,7 +365,7 @@ if env["platform"] in platform_opts:
opts.Add(opt) opts.Add(opt)
# Update the environment to take platform-specific options into account. # Update the environment to take platform-specific options into account.
opts.Update(env, {**ARGUMENTS, **env}) opts.Update(env, {**ARGUMENTS, **env.Dictionary()})
# Detect modules. # Detect modules.
modules_detected = OrderedDict() modules_detected = OrderedDict()
@ -425,7 +425,7 @@ for name, path in modules_detected.items():
env.modules_detected = modules_detected env.modules_detected = modules_detected
# Update the environment again after all the module options are added. # Update the environment again after all the module options are added.
opts.Update(env, {**ARGUMENTS, **env}) opts.Update(env, {**ARGUMENTS, **env.Dictionary()})
Help(opts.GenerateHelpText(env)) Help(opts.GenerateHelpText(env))
# add default include paths # add default include paths