diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-01 19:44:29 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-01 19:44:29 +0200 |
| commit | 6e008cd57955c8029671c4c92250b86767f8ec1f (patch) | |
| tree | ad5fe258f7203a733fbdd231918acd540727a2fb /src/angle/src/libGLESv2/libGLESv2.pro | |
| parent | 275709fb43c154ccb1d95391f4829bd1aecebb12 (diff) | |
| parent | 6fba3c1904aa7601722a70099d88126191cf60cf (diff) | |
Merge 5.5 into 5.5.0
Change-Id: I27921a25a0fc56afb5429e40fc1e9b4b9a645a9a
Diffstat (limited to 'src/angle/src/libGLESv2/libGLESv2.pro')
| -rw-r--r-- | src/angle/src/libGLESv2/libGLESv2.pro | 2 |
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 |