diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-19 08:57:59 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-19 08:57:59 +0200 |
| commit | 550e16b8141caf8d6c0614a423a295b0aea9cab1 (patch) | |
| tree | 1495e6a9808d1140142a2cf46c6e36cba95f8890 /mkspecs/features | |
| parent | 087b4fc6cd3a68db6ac4c3a7f43c03aa6e73c088 (diff) | |
| parent | 9954187adba4d26a1b1aa93874993f15d6d8a0b9 (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: Ia8ac1960387c0f78c32f9d0385bb0aa9a8209af1
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/win32/opengl.prf | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index ebc29d0923..c6fba7770f 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -1,4 +1,14 @@ +QT_FOR_CONFIG += gui + qtConfig(opengles2) { + # Depending on the configuration we use libQtANGLE or libEGL and libGLESv2 + qtConfig(combined-angle-lib) { + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBQTANGLE_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBQTANGLE_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } else { + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME}d -l$${LIBGLESV2_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } # For Desktop, use the ANGLE library location passed on from configure. INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 CONFIG(debug, debug|release) { |