From 6eae3d3c9f43910b479a57a7ce20bcd221ba1677 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 8 Jul 2011 18:52:36 +0200 Subject: sync win32-g++-cross with win32-g++ (lib prefix and extension) qmake now needs library prefix and extension to be supplied. This was added to plain win32-g++ in dbbf06e. Now added to win32-g++-cross. Without this, static libraries get named 'X.lib' instead of 'libX.a'. Merge-request: 1283 Reviewed-by: Oswald Buddenhagen (cherry picked from commit 8ce9dc02cd5031f26c7fec10484a8c47904c46f5) Change-Id: Ic12f655bcfc8a422a98819904ec796d896de77f5 Reviewed-on: http://codereview.qt-project.org/4575 Reviewed-by: Qt Sanity Bot Reviewed-by: Oswald Buddenhagen --- mkspecs/unsupported/win32-g++-cross/qmake.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs/unsupported/win32-g++-cross/qmake.conf') diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf index 01e2f106f3..0538e868b7 100644 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf @@ -62,6 +62,8 @@ QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows QMAKE_LFLAGS_DLL = -shared QMAKE_LINK_OBJECT_MAX = 10 QMAKE_LINK_OBJECT_SCRIPT= object_script +QMAKE_PREFIX_STATICLIB = lib +QMAKE_EXTENSION_STATICLIB = a QMAKE_LIBS = -- cgit v1.2.3