wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-10 02:08:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove ATL/MFC check

Browse source
This commit is contained in:
wuggy 2026-06-25 21:19:58 -07:00
commit 8f8a4e7936
1 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
build/moz.configure/windows.configure
View file

@ -277,10 +277,6 @@ def dia_sdk_dir(vc_path):
def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir): def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
if not vc_path: if not vc_path:
return return
atlmfc_dir = os.path.join(vc_path, 'atlmfc', 'include')
if not os.path.isdir(atlmfc_dir):
die('Cannot find the ATL/MFC headers in the Visual C++ directory (%s). '
'Please install them.' % vc_path)
winrt_dir = os.path.join(windows_sdk_dir.include, 'winrt') winrt_dir = os.path.join(windows_sdk_dir.include, 'winrt')
if not os.path.isdir(winrt_dir): if not os.path.isdir(winrt_dir):
@ -293,7 +289,6 @@ def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
includes.append(include_env) includes.append(include_env)
includes.extend(( includes.extend((
os.path.join(vc_path, 'include'), os.path.join(vc_path, 'include'),
atlmfc_dir,
os.path.join(windows_sdk_dir.include, 'shared'), os.path.join(windows_sdk_dir.include, 'shared'),
os.path.join(windows_sdk_dir.include, 'um'), os.path.join(windows_sdk_dir.include, 'um'),
winrt_dir, winrt_dir,
@ -331,22 +326,12 @@ def lib_path(target, vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
'x86_64': 'x64', 'x86_64': 'x64',
'arm': 'arm', 'arm': 'arm',
}.get(target.cpu) }.get(target.cpu)
atlmfc_dir = os.path.join(vc_path, 'atlmfc', 'lib', *vc_target)
if not os.path.isdir(atlmfc_dir):
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 = [] libs = []
lib_env = os.environ.get('LIB') lib_env = os.environ.get('LIB')
if lib_env: if lib_env:
libs.append(lib_env) libs.append(lib_env)
libs.extend(( libs.extend((
os.path.join(vc_path, 'lib', *vc_target), os.path.join(vc_path, 'lib', *vc_target),
atlmfc_dir,
os.path.join(windows_sdk_dir.lib, 'um', sdk_target), os.path.join(windows_sdk_dir.lib, 'um', sdk_target),
os.path.join(ucrt_sdk_dir.lib, 'ucrt', sdk_target), os.path.join(ucrt_sdk_dir.lib, 'ucrt', sdk_target),
)) ))