diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-11-04 12:58:36 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-11-14 15:11:27 +0000 |
| commit | 9312424fc027660287940955e883236d71a1c0f0 (patch) | |
| tree | dc3a2ddb26c2884fb4e73841f3552f1287ecbd3b /src/core/config | |
| parent | febb6cf2d85c680271f5b0cebf8c7e54c805370f (diff) | |
[Windows] Fix build on 32 bit hosts and update src/3rdparty.
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.
Also updates 3rdparty submodule to enable builds with MSVS2015 and
let the merge from 5.6 to dev pass the CI.
Change-Id: Ifb31a0e379c978b238b3437170c53a02cbde0349
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/config')
| -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") } |