mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-22 10:32:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix VS project generation with SCons 4.8.0+

Browse source 
(cherry picked from commit f682406cf2)
This commit is contained in:
Max Hilbrunner 2024-07-09 09:02:20 +02:00 committed by Rémi Verschelde
parent cd92ad0f69
commit e2543103e4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
methods.py
View file

@ -778,6 +778,7 @@ def detect_visual_c_compiler_version(tools_env):
def find_visual_c_batch_file(env):
# TODO: We should investigate if we can avoid relying on SCons internals here.
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.
@ -795,10 +796,11 @@ def find_visual_c_batch_file(env):
if scons_ver < (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,
# SCons 4.6.0+ removed passing env, so we need to get the product_dir ourselves first,
# then pass that as the last param instead of env as the first param as before.
# We should investigate if we can avoid relying on SCons internals here.
product_dir = find_vc_pdir(env, msvc_version)
# Param names need to be explicit, as they were shuffled around in SCons 4.8.0.
product_dir = find_vc_pdir(msvc_version=msvc_version, env=env)
return find_batch_file(msvc_version, host_platform, target_platform, product_dir)[0]