diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-12-20 23:13:50 +1100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-20 14:23:57 +0100 |
| commit | b2c44985e740d0a0ea86b7b9f4cc849258ac2340 (patch) | |
| tree | a97579649c85ae3384a41ba6b925f0898e4e648c /src | |
| parent | 889e9917731af71762becaf61d8154888178ab39 (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')
| -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 | ||||
| -rw-r--r-- | src/angle/README.qt | 2 | ||||
| -rw-r--r-- | src/angle/src/libEGL/libEGL.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/libGLESv2/libGLESv2.pro | 2 |
7 files changed, 3 insertions, 3 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 diff --git a/src/angle/README.qt b/src/angle/README.qt index e84d29f004..ce5b6332bc 100644 --- a/src/angle/README.qt +++ b/src/angle/README.qt @@ -31,7 +31,7 @@ with the LIBRARY name entry adapted. MinGW-w64 32-bit requires function exports in the .def files to be decorated. Modified versions of the .def files are created as -<library>_mingw.def. The decorated names of each function can be found +<library>_mingw32.def. The decorated names of each function can be found using the nm command to list the symbols in libEGL.o and libGLESv2.o. Using a custom ANGLE diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro index cab94c4ea2..6f3bc25cfb 100644 --- a/src/angle/src/libEGL/libEGL.pro +++ b/src/angle/src/libEGL/libEGL.pro @@ -26,7 +26,7 @@ SOURCES += \ !static { DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}.def - win32-g++*: DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}_mingw.def + win32-g++*:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}_mingw32.def } load(qt_installs) diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro index 47c765b7ce..2412a01b82 100644 --- a/src/angle/src/libGLESv2/libGLESv2.pro +++ b/src/angle/src/libGLESv2/libGLESv2.pro @@ -68,7 +68,7 @@ SSE2_SOURCES += $$ANGLE_DIR/src/libGLESv2/TextureSSE2.cpp !static { DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}.def - win32-g++*: DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}_mingw.def + win32-g++*:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}_mingw32.def } float_converter.target = float_converter |