Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

SCons: scons_version to environment variable

Browse source
This commit is contained in:
Thaddeus Crews 2024-04-23 16:27:54 -05:00 • committed by Rémi Verschelde
parent c7f56d327d
commit fd2ab721e2
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
methods.py
View file

@ -763,19 +763,15 @@ def detect_visual_c_compiler_version(tools_env):
def find_visual_c_batch_file(env):
from SCons.Tool.MSCommon.vc import get_default_version, get_host_target, find_batch_file, find_vc_pdir
# Syntax changed in SCons 4.4.0.
from SCons import __version__ as scons_raw_version
scons_ver = env._get_major_minor_revision(scons_raw_version)
msvc_version = get_default_version(env)
if scons_ver >= (4, 4, 0):
# Syntax changed in SCons 4.4.0.
if env.scons_version >= (4, 4, 0):
(host_platform, target_platform, _) = get_host_target(env, msvc_version)
else:
(host_platform, target_platform, _) = get_host_target(env)
if scons_ver < (4, 6, 0):
if env.scons_version < (4, 6, 0):
return find_batch_file(env, msvc_version, host_platform, target_platform)[0]
# Scons 4.6.0+ removed passing env, so we need to get the product_dir ourselves first,