diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-09-01 08:11:27 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@digia.com> | 2014-09-01 14:28:06 +0200 |
| commit | 552ac4bcb69d146c35e0b8adc83f3634d84a1d18 (patch) | |
| tree | c45868806d6567764610a7f9a90d0e1ed5b36d3b /src/angle | |
| parent | da2b3c4479e1d23ea6ead555cadc96a56967887a (diff) | |
| download | qtbase-552ac4bcb69d146c35e0b8adc83f3634d84a1d18.tar.gz | |
ANGLE: Don't directly link to DirectX 11
These libraries are dynamically loaded on desktop Windows.
Change-Id: I3a0d17a48a3bd4930690d20d387df0d92906662d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/angle')
| -rw-r--r-- | src/angle/src/libEGL/libEGL.pro | 5 | ||||
| -rw-r--r-- | src/angle/src/libGLESv2/libGLESv2.pro | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro index dc286ca11d..48ce7055fd 100644 --- a/src/angle/src/libEGL/libEGL.pro +++ b/src/angle/src/libEGL/libEGL.pro @@ -1,10 +1,7 @@ CONFIG += installed include(../common/common.pri) -angle_d3d11: \ - LIBS_PRIVATE += -ld3d11 -!winrt: \ - LIBS_PRIVATE += -ld3d9 +winrt: LIBS_PRIVATE += -ld3d11 LIBS_PRIVATE += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2) diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro index 8109c34942..2e84df0d39 100644 --- a/src/angle/src/libGLESv2/libGLESv2.pro +++ b/src/angle/src/libGLESv2/libGLESv2.pro @@ -4,12 +4,10 @@ include(../common/common.pri) INCLUDEPATH += $$OUT_PWD/.. $$ANGLE_DIR/src/libGLESv2 # Remember to adapt tools/configure/configureapp.cpp if the Direct X version changes. -angle_d3d11: \ - LIBS_PRIVATE += -ldxgi -ld3d11 !winrt: \ LIBS_PRIVATE += -ld3d9 winrt: \ - LIBS_PRIVATE += -ld3dcompiler + LIBS_PRIVATE += -ld3dcompiler -ldxgi -ld3d11 LIBS_PRIVATE += -ldxguid |