diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-02-14 09:43:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-25 10:34:11 +0100 |
| commit | a8fce5d6e2cfc4971ca932a18e38662de3482cbc (patch) | |
| tree | 3786c32f963529251c36b36fe1a9ae4ea0f31ee3 /mkspecs | |
| parent | 7686b2386d60c17aa70c621fe94afc646314e6ac (diff) | |
ANGLE: Fix static build.
Introduce QT_OPENGL_ES_2_ANGLE_STATIC define for static builds
and modify export accordingly. Provided static instances
of gl::Current and egl::Current for Qt's single threaded
use.
Task-number: QTBUG-28196
Change-Id: Ia75699d6da103fb8dd9d5fe97c1ee51e48a74406
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/win32/opengl.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index 898dee77f9..0f33f31e59 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -21,6 +21,7 @@ wince* { QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_RELEASE } DEFINES += QT_OPENGL_ES_2 QT_OPENGL_ES_2_ANGLE + contains(QT_CONFIG, static): DEFINES += QT_OPENGL_ES_2_ANGLE_STATIC QT_CONFIG -= opengl } else { QMAKE_LIBS += $$QMAKE_LIBS_OPENGL |