diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-30 08:57:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-01 08:30:38 +0100 |
| commit | 95a05904b9dfd48865dcdc0ef8941db794bb5d06 (patch) | |
| tree | a9ad4dde77d8c0e617df5286ae2c69216064c9aa /mkspecs/features/win32 | |
| parent | f229db5d57a5976db87d9d69826cae655b5e609a (diff) | |
ANGLE: Fix debug-and-release builds
Add a 'd' to debug builds to allow both release and debug builds
to be used.
- Add .def-files for Debug
- Build all libraries debug/release
- Add description to README.qt
- Differentiate debug/release in qmake.conf.
Task-number: QTBUG-28196
Change-Id: Ib3081004a6ed2ad71d353244154684d2e0ebbc86
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'mkspecs/features/win32')
| -rw-r--r-- | mkspecs/features/win32/opengl.prf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index 1b1603cf74..898dee77f9 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -9,10 +9,15 @@ wince* { contains(QT_CONFIG, opengles2) { # For Desktop, use the ANGLE library location passed on from configure. INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 - LIBS += $$QMAKE_LIBS_OPENGL_ES2 CONFIG(debug, debug|release) { QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_DEBUG + contains(QT_CONFIG, 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 } DEFINES += QT_OPENGL_ES_2 QT_OPENGL_ES_2_ANGLE |