diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-11-04 12:58:36 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-11-04 15:02:56 +0000 |
| commit | 3c8235193b7e9283bfb40dc0a1b4fe72c1947dbf (patch) | |
| tree | fea91632504f92927feefa92e92b1c3af8b391d6 /src/core | |
| parent | 10cd4401b9e4e9fde2a8e17c70a0d11d2dfc306f (diff) | |
[Windows] Fix build on 32 bit hosts.
The default Windows SDK path is different on 32 bit machines. Adjust it
to look for the D3D dlls in the right location.
Co-Authored with Kai Koehne.
Change-Id: If313188cdcc4634c3c9bf9dad6d2dce229fa3faa
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/windows.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 602afbc67..f0c0c8f43 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -39,6 +39,11 @@ msvc { GYP_ARGS += "-G msvs_version=$$MSVS_VERSION" + # The check below is ugly, but necessary, as it seems to be the only reliable way to detect if the host + # architecture is 32 bit. QMAKE_HOST.arch does not work as it returns the architecture that the toolchain + # is building for, not the system's actual architecture. + PROGRAM_FILES_X86 = $$(ProgramW6432) + isEmpty(PROGRAM_FILES_X86): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/8.1\"" } else { fatal("Qt WebEngine for Windows can only be built with the Microsoft Visual Studio C++ compiler") } |