diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-12-12 12:21:16 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-12-17 21:29:05 +0000 |
commit | 1ef9859e7e0b0d2a88acd287b5b1e4bea8b27ae8 (patch) | |
tree | 6df0486c7f2c02294762446349431c29f4cf988b /src/plugins/platforms/direct2d/direct2d.pro | |
parent | bd05a009f0f9119dccf912550a6b44f825a9400b (diff) |
configure: refactor directx checks
properly atomize the libraries and express their dependencies, and
adjust the project files accordingly.
note that we don't try to use any additional paths, as all SDKs we
currently support have built-in directx 11 support:
- msvc2013 comes with win sdk 8.1; that is also used for win7 targets
- mingw-64 5.3 (though this one is missing fxc, which is why the code
path for using an external sdk for that remains)
Change-Id: Ib44e389ef46567308293c2bbcad20a96e8ef70c7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/platforms/direct2d/direct2d.pro')
-rw-r--r-- | src/plugins/platforms/direct2d/direct2d.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro index 3bfd02bdc8..9764272632 100644 --- a/src/plugins/platforms/direct2d/direct2d.pro +++ b/src/plugins/platforms/direct2d/direct2d.pro @@ -8,7 +8,8 @@ QT += \ qtConfig(accessibility): QT += accessibility_support-private qtConfig(vulkan): QT += vulkan_support-private -LIBS += -ldwmapi -ld2d1 -ld3d11 -ldwrite -lversion -lgdi32 +LIBS += -ldwmapi -lversion -lgdi32 +QMAKE_USE_PRIVATE += dwrite_1 d2d1_1 d3d11_1 dxgi1_2 include(../windows/windows.pri) |