From b2c44985e740d0a0ea86b7b9f4cc849258ac2340 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 20 Dec 2012 23:13:50 +1100 Subject: [PATCH] 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 _mingw.def to _mingw32.def and only use them if QT_ARCH is i386. Change-Id: I5dc2a87f7d2ed59bf954faf2983d0787ed9e00e9 Reviewed-by: Kai Koehne Reviewed-by: Patrick von Reth Reviewed-by: Friedemann Kleint --- .../angle/src/libEGL/{libEGL_mingw.def => libEGL_mingw32.def} | 0 .../angle/src/libEGL/{libEGLd_mingw.def => libEGLd_mingw32.def} | 0 .../libGLESv2/{libGLESv2_mingw.def => libGLESv2_mingw32.def} | 0 .../libGLESv2/{libGLESv2d_mingw.def => libGLESv2d_mingw32.def} | 0 src/angle/README.qt | 2 +- src/angle/src/libEGL/libEGL.pro | 2 +- src/angle/src/libGLESv2/libGLESv2.pro | 2 +- 7 files changed, 3 insertions(+), 3 deletions(-) rename src/3rdparty/angle/src/libEGL/{libEGL_mingw.def => libEGL_mingw32.def} (100%) rename src/3rdparty/angle/src/libEGL/{libEGLd_mingw.def => libEGLd_mingw32.def} (100%) rename src/3rdparty/angle/src/libGLESv2/{libGLESv2_mingw.def => libGLESv2_mingw32.def} (100%) rename src/3rdparty/angle/src/libGLESv2/{libGLESv2d_mingw.def => libGLESv2d_mingw32.def} (100%) diff --git a/src/3rdparty/angle/src/libEGL/libEGL_mingw.def b/src/3rdparty/angle/src/libEGL/libEGL_mingw32.def similarity index 100% rename from src/3rdparty/angle/src/libEGL/libEGL_mingw.def rename to 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 similarity index 100% rename from src/3rdparty/angle/src/libEGL/libEGLd_mingw.def rename to 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 similarity index 100% rename from src/3rdparty/angle/src/libGLESv2/libGLESv2_mingw.def rename to 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 similarity index 100% rename from src/3rdparty/angle/src/libGLESv2/libGLESv2d_mingw.def rename to 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 -_mingw.def. The decorated names of each function can be found +_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