diff options
| author | Caroline Chao <caroline.chao@nokia.com> | 2011-09-16 08:14:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-11 02:45:05 +0100 |
| commit | b0a7af6b4debecd7226289f278e5acf571d80c64 (patch) | |
| tree | 879defb9721584901f8c21132548b9ca116c9b96 /mkspecs | |
| parent | f3b46a0f4d33e4c73835cf32d2742de4ee5a7841 (diff) | |
Add missing naming for libraries built statically.
Extension .a for Mac and Linux and .lib for Windows.
Change-Id: I1e979b2a6b29eeab35620aa0bbabb27f10cdda68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/resolve_target.prf | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/resolve_target.prf b/mkspecs/features/resolve_target.prf index 24d2e0d6b4..951a613910 100644 --- a/mkspecs/features/resolve_target.prf +++ b/mkspecs/features/resolve_target.prf @@ -8,7 +8,8 @@ win32 { TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0) isEqual(TARGET_VERSION_EXT, 0):unset(TARGET_VERSION_EXT) } - TARGET_EXT = .dll + static:TARGET_EXT = .lib + else:TARGET_EXT = .dll } else { TARGET_EXT = .exe } @@ -27,7 +28,8 @@ win32 { isEmpty(TEMP_VERSION):TEMP_VERSION = 1 QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}.$${TEMP_VERSION} } - QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}.$${QMAKE_EXTENSION_SHLIB} + static:QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}.$${QMAKE_EXTENSION_STATICLIB} + else:QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}.$${QMAKE_EXTENSION_SHLIB} } } else { app_bundle { @@ -38,7 +40,9 @@ win32 { } } else { equals(TEMPLATE, lib) { - plugin { + static { + QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.a + } else:plugin { QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.so } else { TEMP_VERSION = $$VERSION |