From b0a7af6b4debecd7226289f278e5acf571d80c64 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Fri, 16 Sep 2011 08:14:03 +0200 Subject: Add missing naming for libraries built statically. Extension .a for Mac and Linux and .lib for Windows. Change-Id: I1e979b2a6b29eeab35620aa0bbabb27f10cdda68 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/resolve_target.prf | 10 +++++++--- 1 file 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 -- cgit v1.2.3