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 /src/3rdparty/angle/include/KHR | |
| 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 'src/3rdparty/angle/include/KHR')
| -rw-r--r-- | src/3rdparty/angle/include/KHR/khrplatform.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/angle/include/KHR/khrplatform.h b/src/3rdparty/angle/include/KHR/khrplatform.h index 56c676c77b..18a104ea1f 100644 --- a/src/3rdparty/angle/include/KHR/khrplatform.h +++ b/src/3rdparty/angle/include/KHR/khrplatform.h @@ -97,7 +97,8 @@ *------------------------------------------------------------------------- * This precedes the return type of the function in the function prototype. */ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) + +#if defined(_WIN32) && !defined(__SCITECH_SNAP__) && !defined(QT_OPENGL_ES_2_ANGLE_STATIC) # define KHRONOS_APICALL __declspec(dllimport) #elif defined (__SYMBIAN32__) # define KHRONOS_APICALL IMPORT_C |