diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-07-01 16:03:47 +0200 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-07-01 16:03:47 +0200 |
| commit | 8d88a9328eb57666297760f6da6af29d9396b6d3 (patch) | |
| tree | e5e583b2034e7e01d07060dbd9c0c4f6513dd9f9 | |
| parent | 9bdcb5b3a88a99bcbeb3fa961baf0211007d4015 (diff) | |
| download | uxp-8d88a9328eb57666297760f6da6af29d9396b6d3.tar.gz | |
Issue #1817 - Detect MFC library path on VS2017.
BZ Bug 1318189
| -rw-r--r-- | build/moz.configure/windows.configure | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure index 1ad2cd3eb6..9df4e11fbd 100644 --- a/build/moz.configure/windows.configure +++ b/build/moz.configure/windows.configure @@ -279,8 +279,11 @@ def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir): 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) + # For Visual Studio 2017 + atlmfc_dir = os.path.join(vc_path, 'atlmfc', 'lib', sdk_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) winrt_dir = os.path.join(windows_sdk_dir.include, 'winrt') if not os.path.isdir(winrt_dir): |