diff options
Diffstat (limited to 'src/angle')
| -rw-r--r-- | src/angle/src/common/common.pri | 2 | ||||
| -rw-r--r-- | src/angle/src/compiler/preprocessor/preprocessor.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/compiler/translator.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/config.pri | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index 9eae06d410..c948e27dc3 100644 --- a/src/angle/src/common/common.pri +++ b/src/angle/src/common/common.pri @@ -1,5 +1,5 @@ # static builds should still link ANGLE dynamically when dynamic GL is enabled -static:contains(QT_CONFIG, dynamicgl) { +static:qtConfig(dynamicgl) { CONFIG -= static CONFIG += shared } diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro index cbf411623d..f9170b3bee 100644 --- a/src/angle/src/compiler/preprocessor/preprocessor.pro +++ b/src/angle/src/compiler/preprocessor/preprocessor.pro @@ -1,5 +1,5 @@ CONFIG += static -contains(QT_CONFIG, dynamicgl): CONFIG += not_installed +qtConfig(dynamicgl): CONFIG += not_installed include(../../config.pri) INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro index d48ac70472..cee13d06bb 100644 --- a/src/angle/src/compiler/translator.pro +++ b/src/angle/src/compiler/translator.pro @@ -1,5 +1,5 @@ CONFIG += static -contains(QT_CONFIG, dynamicgl): CONFIG += not_installed +qtConfig(dynamicgl): CONFIG += not_installed include(../config.pri) INCLUDEPATH += \ diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri index 2c5b5ec615..4beb095217 100644 --- a/src/angle/src/config.pri +++ b/src/angle/src/config.pri @@ -40,8 +40,6 @@ DEFINES += _WINDOWS \ CONFIG += angle_d3d11 # Remove to disable D3D11 renderer -equals(QMAKE_TARGET_OS, xp): CONFIG -= angle_d3d11 - angle_d3d11 { DEFINES += ANGLE_ENABLE_D3D11 ANGLE_DEFAULT_D3D11=1 !build_pass: message("Enabling D3D11 mode for ANGLE") |