From 552ac4bcb69d146c35e0b8adc83f3634d84a1d18 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Mon, 1 Sep 2014 08:11:27 +0300 Subject: ANGLE: Don't directly link to DirectX 11 These libraries are dynamically loaded on desktop Windows. Change-Id: I3a0d17a48a3bd4930690d20d387df0d92906662d Reviewed-by: Friedemann Kleint --- src/angle/src/libEGL/libEGL.pro | 5 +---- src/angle/src/libGLESv2/libGLESv2.pro | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src') 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 -- cgit v1.2.3