asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #85357 from mhilbrunner/fix-generate-vsproj

Browse source 
Fix generating vsproj with SCons 4.6.0+
This commit is contained in:
Rémi Verschelde 2023-11-26 00:03:35 +01:00 committed by GitHub
commit 5df9867967
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
methods.py
View file

@ -708,25 +708,28 @@ 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 ( from SCons.Tool.MSCommon.vc import get_default_version, get_host_target, find_batch_file, find_vc_pdir
get_default_version,
get_host_target,
find_batch_file,
)
# Syntax changed in SCons 4.4.0. # Syntax changed in SCons 4.4.0.
from SCons import __version__ as scons_raw_version from SCons import __version__ as scons_raw_version
scons_ver = env._get_major_minor_revision(scons_raw_version) scons_ver = env._get_major_minor_revision(scons_raw_version)
version = get_default_version(env) msvc_version = get_default_version(env)
if scons_ver >= (4, 4, 0): if scons_ver >= (4, 4, 0):
(host_platform, target_platform, _) = get_host_target(env, version) (host_platform, target_platform, _) = get_host_target(env, msvc_version)
else: else:
(host_platform, target_platform, _) = get_host_target(env) (host_platform, target_platform, _) = get_host_target(env)
return find_batch_file(env, version, host_platform, target_platform)[0] 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,
# 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)
return find_batch_file(msvc_version, host_platform, target_platform, product_dir)[0]
def generate_cpp_hint_file(filename): def generate_cpp_hint_file(filename):