diff options
| author | Andrew Knight <andrew.knight@intopalo.com> | 2015-09-24 10:42:43 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@intopalo.com> | 2015-09-24 12:53:52 +0000 |
| commit | 231199798ab3eff88ab87511af1dd87630173adb (patch) | |
| tree | 76f4abffd912ed19812255633d9a236e5f26b7f9 /src/angle | |
| parent | b46ffbca0cfad41599873d4ca19dc79167c3955f (diff) | |
Build ANGLE dynamically under static builds which have dynamic GL enabled
Task-number: QTBUG-46814
Change-Id: I8108bcd6f8badbb135f593dcf280470e03b11bff
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/angle')
| -rw-r--r-- | src/angle/src/common/common.pri | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index 57f92f1089..8e2333d2ba 100644 --- a/src/angle/src/common/common.pri +++ b/src/angle/src/common/common.pri @@ -48,4 +48,10 @@ winrt|if(msvc:!win32-msvc2005:!win32-msvc2008:!win32-msvc2010) { } } +# static builds should still link ANGLE dynamically when dynamic GL is enabled +static:contains(QT_CONFIG, dynamicgl) { + CONFIG -= static + CONFIG += shared +} + static: DEFINES *= LIBGLESV2_EXPORT_H_ ANGLE_EXPORT= |