Skip to content

Commit

Permalink
Fix VS project generation with SCons 4.8.0+
Browse files Browse the repository at this point in the history
  • Loading branch information
mhilbrunner committed Jul 9, 2024
1 parent 9425535 commit f682406
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,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 find_batch_file, find_vc_pdir, get_default_version, get_host_target

msvc_version = get_default_version(env)
Expand All @@ -661,10 +662,11 @@ def find_visual_c_batch_file(env):
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,
# 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]


Expand Down

0 comments on commit f682406

Please sign in to comment.