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

SCons: Fix creating VS solution with SCons 4.4.0 

Fixes #63709.

Co-authored-by: 19PHOBOSS98 <37253663+19PHOBOSS98@users.noreply.github.com>
(cherry picked from commit 89847dc6e3)
This commit is contained in:
Rémi Verschelde 2022-07-31 13:58:05 +02:00
parent 60d34604d5
commit e0214a14f3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
methods.py
View File

@ -619,8 +619,18 @@ def detect_visual_c_compiler_version(tools_env):
def find_visual_c_batch_file(env): def find_visual_c_batch_file(env):
from SCons.Tool.MSCommon.vc import get_default_version, get_host_target, find_batch_file from SCons.Tool.MSCommon.vc import get_default_version, get_host_target, find_batch_file
# 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)
version = get_default_version(env) version = get_default_version(env)
(host_platform, target_platform, _) = get_host_target(env)
if scons_ver >= (4, 4, 0):
(host_platform, target_platform, _) = get_host_target(env, version)
else:
(host_platform, target_platform, _) = get_host_target(env)
return find_batch_file(env, version, host_platform, target_platform)[0] return find_batch_file(env, version, host_platform, target_platform)[0]