1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing naming for libraries built statically.

Browse Source 
Extension .a for Mac and Linux and .lib for Windows.

Change-Id: I1e979b2a6b29eeab35620aa0bbabb27f10cdda68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Caroline Chao 2011-09-16 08:14:03 +02:00 committed by Qt by Nokia
parent f3b46a0f4d
commit b0a7af6b4d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mkspecs/features/resolve_target.prf
View File

@ -8,7 +8,8 @@ win32 {
TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0) TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0)
isEqual(TARGET_VERSION_EXT, 0):unset(TARGET_VERSION_EXT) isEqual(TARGET_VERSION_EXT, 0):unset(TARGET_VERSION_EXT)
} }
TARGET_EXT = .dll static:TARGET_EXT = .lib
else:TARGET_EXT = .dll
} else { } else {
TARGET_EXT = .exe TARGET_EXT = .exe
} }
@ -27,7 +28,8 @@ win32 {
isEmpty(TEMP_VERSION):TEMP_VERSION = 1 isEmpty(TEMP_VERSION):TEMP_VERSION = 1
QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}.$${TEMP_VERSION} 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 { } else {
app_bundle { app_bundle {
@ -38,7 +40,9 @@ win32 {
} }
} else { } else {
equals(TEMPLATE, lib) { 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 QMAKE_RESOLVED_TARGET = $${QMAKE_RESOLVED_TARGET}$${LIBPREFIX}$${TARGET}.so
} else { } else {
TEMP_VERSION = $$VERSION TEMP_VERSION = $$VERSION