diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure index 048b46eebe..e9cfb3e4f1 100644 --- a/build/moz.configure/windows.configure +++ b/build/moz.configure/windows.configure @@ -277,10 +277,6 @@ def dia_sdk_dir(vc_path): def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir): if not vc_path: 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') 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.extend(( os.path.join(vc_path, 'include'), - atlmfc_dir, os.path.join(windows_sdk_dir.include, 'shared'), os.path.join(windows_sdk_dir.include, 'um'), winrt_dir, @@ -331,22 +326,12 @@ def lib_path(target, vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir): 'x86_64': 'x64', 'arm': 'arm', }.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 = [] lib_env = os.environ.get('LIB') if lib_env: libs.append(lib_env) libs.extend(( os.path.join(vc_path, 'lib', *vc_target), - atlmfc_dir, os.path.join(windows_sdk_dir.lib, 'um', sdk_target), os.path.join(ucrt_sdk_dir.lib, 'ucrt', sdk_target), ))