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/angle | |
| parent | bd05a009f0f9119dccf912550a6b44f825a9400b (diff) | |
| download | qtbase-1ef9859e7e0b0d2a88acd287b5b1e4bea8b27ae8.tar.gz | |
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/angle')
| -rw-r--r-- | src/angle/src/common/gles_common.pri | 6 | ||||
| -rw-r--r-- | src/angle/src/libEGL/libEGL.pro | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/angle/src/common/gles_common.pri b/src/angle/src/common/gles_common.pri index fdd0e45971..70b65dd4cc 100644 --- a/src/angle/src/common/gles_common.pri +++ b/src/angle/src/common/gles_common.pri @@ -8,11 +8,11 @@ INCLUDEPATH += \ # Remember to adapt src/gui/configure.* if the Direct X version changes. !winrt: \ - LIBS_PRIVATE += -ld3d9 + QMAKE_USE_PRIVATE += d3d9 winrt: \ - LIBS_PRIVATE += -ld3dcompiler -ldxgi -ld3d11 + QMAKE_USE_PRIVATE += d3dcompiler d3d11 dxgi -LIBS_PRIVATE += -ldxguid +QMAKE_USE_PRIVATE += dxguid STATICLIBS = translator preprocessor for(libname, STATICLIBS) { diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro index 889f39890e..912ff7825e 100644 --- a/src/angle/src/libEGL/libEGL.pro +++ b/src/angle/src/libEGL/libEGL.pro @@ -1,9 +1,10 @@ include(../common/common.pri) DEF_FILE_TARGET = $${TARGET} TARGET = $$qtLibraryTarget($${LIBEGL_NAME}) -winrt: LIBS_PRIVATE += -ld3d11 +winrt: QMAKE_USE_PRIVATE += d3d11 +QMAKE_USE_PRIVATE += dxguid -LIBS_PRIVATE += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget($${LIBGLESV2_NAME}) +LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget($${LIBGLESV2_NAME}) DEFINES += GL_APICALL= GL_GLEXT_PROTOTYPES= EGLAPI= LIBEGL_IMPLEMENTATION |