summaryrefslogtreecommitdiffstats
path: root/src/angle
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@intopalo.com>2015-05-27 12:57:58 +0300
committerAndrew Knight <andrew.knight@intopalo.com>2015-05-28 06:42:04 +0000
commit347cc69cb2caa5f2f682bd213429394f4d668f4b (patch)
tree8480b1a04d12899ee863e0da9315b354f4bd4bbf /src/angle
parente22d75d0b139fe9e4b11f32ebc5fb1024f493fbe (diff)
ANGLE: fix DllMain collision in static builds
The symbol is simply renamed in static builds, allowing wrappers of the library to still call the function if needed. Task-number: QTBUG-46209 Change-Id: I5d4ad2df59f206a3794b99364d122f9d0f12f8c6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Tim Blechmann <tim@klingt.org> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/angle')
-rw-r--r--src/angle/src/libGLESv2/libGLESv2.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro
index 1bf9af0436..5979b68098 100644
--- a/src/angle/src/libGLESv2/libGLESv2.pro
+++ b/src/angle/src/libGLESv2/libGLESv2.pro
@@ -329,6 +329,8 @@ angle_d3d11 {
!static {
DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}.def
mingw:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}_mingw32.def
+} else {
+ DEFINES += DllMain=DllMain_ANGLE # prevent symbol from conflicting with the user's DllMain
}
float_converter.target = float_converter