diff options
author | Mark Brand <mabrand@mabrand.nl> | 2011-07-08 16:52:36 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-08 16:52:36 (GMT) |
commit | 8ce9dc02cd5031f26c7fec10484a8c47904c46f5 (patch) | |
tree | 65ddf6570d372758c9e2005a515595d8f344f2cd /mkspecs/unsupported/win32-g++-cross | |
parent | 52c2bf0e0dc5bcad1b75f9b8d817b39ca7754476 (diff) | |
download | Qt-8ce9dc02cd5031f26c7fec10484a8c47904c46f5.zip Qt-8ce9dc02cd5031f26c7fec10484a8c47904c46f5.tar.gz Qt-8ce9dc02cd5031f26c7fec10484a8c47904c46f5.tar.bz2 |
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 <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/unsupported/win32-g++-cross')
-rw-r--r-- | mkspecs/unsupported/win32-g++-cross/qmake.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf index 01e2f10..0538e86 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 = |