Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2023-06-26 10:38:35 +08:00
commit 4fae28f059
973 changed files with 232026 additions and 6 deletions

View file

@ -157,6 +157,7 @@ def old_configure_options(*options):
'--enable-address-sanitizer',
'--enable-alsa',
'--enable-av1',
'--enable-jxl',
'--enable-b2g-bt',
'--enable-b2g-camera',
'--enable-b2g-ril',

View file

@ -334,8 +334,10 @@ def lib_path(target, vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
atlmfc_dir = os.path.join(vc_path, 'atlmfc', 'lib', *vc_target)
if not os.path.isdir(atlmfc_dir):
die('Cannot find the ATL/MFC libraries in the Visual C++ directory (%s). '
'Please install them.' % vc_path)
atlmfc_dir = atlmfc_dir.replace('amd64','x64')
if not os.path.isdir(atlmfc_dir):
die('Cannot find the ATL/MFC libraries in the Visual C++ directory (%s). '
'Please install them.' % vc_path)
libs = []