From 854e5c473b618b7bcec213faf92ffa24cadc5f3e Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 19 Dec 2012 00:53:46 +1100 Subject: Fix linking ANGLE on MinGW-w64 32-bit MinGW-w64 32-bit requires the functions exported in the .def file to be decorated. Change-Id: I174a92829706a9fb6b0007b2c057300bd69e6d9e Reviewed-by: Friedemann Kleint Reviewed-by: Kai Koehne --- src/angle/src/libEGL/libEGL.pro | 5 ++++- src/angle/src/libGLESv2/libGLESv2.pro | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/angle/src') diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro index 78be1625c0..cab94c4ea2 100644 --- a/src/angle/src/libEGL/libEGL.pro +++ b/src/angle/src/libEGL/libEGL.pro @@ -24,7 +24,10 @@ SOURCES += \ $$ANGLE_DIR/src/libEGL/main.cpp \ $$ANGLE_DIR/src/libEGL/Surface.cpp -!static:DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}.def +!static { + DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}.def + win32-g++*: DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}_mingw.def +} load(qt_installs) diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro index 7f2c59355d..47c765b7ce 100644 --- a/src/angle/src/libGLESv2/libGLESv2.pro +++ b/src/angle/src/libGLESv2/libGLESv2.pro @@ -66,7 +66,10 @@ SOURCES += \ SSE2_SOURCES += $$ANGLE_DIR/src/libGLESv2/TextureSSE2.cpp -!static:DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}.def +!static { + DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}.def + win32-g++*: DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}_mingw.def +} float_converter.target = float_converter float_converter.commands = python $$ANGLE_DIR/src/libGLESv2/Float16ToFloat32.py \ -- cgit v1.2.3