summaryrefslogtreecommitdiffstats
path: root/src/angle/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-02-14 09:43:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-25 10:34:11 +0100
commita8fce5d6e2cfc4971ca932a18e38662de3482cbc (patch)
tree3786c32f963529251c36b36fe1a9ae4ea0f31ee3 /src/angle/src
parent7686b2386d60c17aa70c621fe94afc646314e6ac (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 'src/angle/src')
-rw-r--r--src/angle/src/common/common.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri
index c7d2a2d5ae..d16202b6d6 100644
--- a/src/angle/src/common/common.pri
+++ b/src/angle/src/common/common.pri
@@ -40,6 +40,8 @@ win32-msvc2012 {
}
}
+static: DEFINES *= QT_OPENGL_ES_2_ANGLE_STATIC
+
HEADERS += \
$$ANGLE_DIR/src/common/angleutils.h \
$$ANGLE_DIR/src/common/debug.h \