sync win32-g++-cross with win32-g++ (lib prefix and extension)
authorMark Brand <mabrand@mabrand.nl>
Fri, 8 Jul 2011 16:52:36 +0000 (18:52 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 12 Sep 2011 14:03:47 +0000 (16:03 +0200)
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 <oswald.buddenhagen@nokia.com>
(cherry picked from commit 8ce9dc02cd5031f26c7fec10484a8c47904c46f5)

Change-Id: Ic12f655bcfc8a422a98819904ec796d896de77f5
Reviewed-on: http://codereview.qt-project.org/4575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
mkspecs/unsupported/win32-g++-cross/qmake.conf

index 01e2f10..0538e86 100644 (file)
@@ -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             =