summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2012-12-20 23:13:50 +1100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-20 14:23:57 +0100
commitb2c44985e740d0a0ea86b7b9f4cc849258ac2340 (patch)
treea97579649c85ae3384a41ba6b925f0898e4e648c /src/3rdparty/angle
parent889e9917731af71762becaf61d8154888178ab39 (diff)
Fix linking ANGLE on MinGW-w64 64-bit
The MinGW-w64 32-bit .def files shouldn't be used with MinGW-w64 64-bit. Rename .def files from <library>_mingw.def to <library>_mingw32.def and only use them if QT_ARCH is i386. Change-Id: I5dc2a87f7d2ed59bf954faf2983d0787ed9e00e9 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Patrick von Reth <vonreth@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/3rdparty/angle')
-rw-r--r--src/3rdparty/angle/src/libEGL/libEGL_mingw32.def (renamed from src/3rdparty/angle/src/libEGL/libEGL_mingw.def)0
-rw-r--r--src/3rdparty/angle/src/libEGL/libEGLd_mingw32.def (renamed from src/3rdparty/angle/src/libEGL/libEGLd_mingw.def)0
-rw-r--r--src/3rdparty/angle/src/libGLESv2/libGLESv2_mingw32.def (renamed from src/3rdparty/angle/src/libGLESv2/libGLESv2_mingw.def)0
-rw-r--r--src/3rdparty/angle/src/libGLESv2/libGLESv2d_mingw32.def (renamed from src/3rdparty/angle/src/libGLESv2/libGLESv2d_mingw.def)0
4 files changed, 0 insertions, 0 deletions
diff --git a/src/3rdparty/angle/src/libEGL/libEGL_mingw.def b/src/3rdparty/angle/src/libEGL/libEGL_mingw32.def
index 8128e7c4f0..8128e7c4f0 100644
--- a/src/3rdparty/angle/src/libEGL/libEGL_mingw.def
+++ b/src/3rdparty/angle/src/libEGL/libEGL_mingw32.def
diff --git a/src/3rdparty/angle/src/libEGL/libEGLd_mingw.def b/src/3rdparty/angle/src/libEGL/libEGLd_mingw32.def
index 1c72413f89..1c72413f89 100644
--- a/src/3rdparty/angle/src/libEGL/libEGLd_mingw.def
+++ b/src/3rdparty/angle/src/libEGL/libEGLd_mingw32.def
diff --git a/src/3rdparty/angle/src/libGLESv2/libGLESv2_mingw.def b/src/3rdparty/angle/src/libGLESv2/libGLESv2_mingw32.def
index dc5900854a..dc5900854a 100644
--- a/src/3rdparty/angle/src/libGLESv2/libGLESv2_mingw.def
+++ b/src/3rdparty/angle/src/libGLESv2/libGLESv2_mingw32.def
diff --git a/src/3rdparty/angle/src/libGLESv2/libGLESv2d_mingw.def b/src/3rdparty/angle/src/libGLESv2/libGLESv2d_mingw32.def
index 610e5e1173..610e5e1173 100644
--- a/src/3rdparty/angle/src/libGLESv2/libGLESv2d_mingw.def
+++ b/src/3rdparty/angle/src/libGLESv2/libGLESv2d_mingw32.def