diff options
Diffstat (limited to 'mkspecs/features/win32/opengl.prf')
| -rw-r--r-- | mkspecs/features/win32/opengl.prf | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index f21848f941..a4aca843ea 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -1,39 +1,6 @@ QT_FOR_CONFIG += gui -defineTest(prependOpenGlLib) { - path = $$QT.core.libs/$$QMAKE_PREFIX_STATICLIB$$1 - ext = .$$QMAKE_EXTENSION_STATICLIB - QMAKE_LIBS_OPENGL_ES2 = $${path}$${ext} $$QMAKE_LIBS_OPENGL_ES2 - QMAKE_LIBS_OPENGL_ES2_DEBUG = $${path}d$${ext} $$QMAKE_LIBS_OPENGL_ES2_DEBUG - export(QMAKE_LIBS_OPENGL_ES2) - export(QMAKE_LIBS_OPENGL_ES2_DEBUG) -} - -qtConfig(opengles2) { - # Depending on the configuration we use libQtANGLE or libEGL and libGLESv2 - qtConfig(combined-angle-lib) { - prependOpenGlLib($$LIBQTANGLE_NAME) - } else { - prependOpenGlLib($$LIBGLESV2_NAME) - prependOpenGlLib($$LIBEGL_NAME) - } -# For Desktop, use the ANGLE library location passed on from configure. - INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 - CONFIG(debug, debug|release) { - QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_DEBUG - qtConfig(angle) { - LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG - } else { - LIBS += $$QMAKE_LIBS_OPENGL_ES2 - } - } else { - LIBS += $$QMAKE_LIBS_OPENGL_ES2 - QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_RELEASE - } - qtConfig(static): DEFINES += GL_APICALL= EGLAPI= -} else { - !qtConfig(dynamicgl) { - QMAKE_LIBS += $$QMAKE_LIBS_OPENGL - QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL - } +!qtConfig(dynamicgl) { + QMAKE_LIBS += $$QMAKE_LIBS_OPENGL + QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL } |