From aaf189b084f524c6e4230fddb25b8494364d83e9 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 9 Mar 2010 10:02:49 +0100 Subject: Enabled dependencies for .dso and .lib libraries only. This adds support for .lib files, as well as removes support for all others than .dso and .lib. This builds on the original commit bdff51768dfe. --- mkspecs/symbian/features/symbian_building.prf | 3 +-- qmake/generators/unix/unixmake2.cpp | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mkspecs/symbian/features/symbian_building.prf b/mkspecs/symbian/features/symbian_building.prf index a7663af..f1907c2 100644 --- a/mkspecs/symbian/features/symbian_building.prf +++ b/mkspecs/symbian/features/symbian_building.prf @@ -31,6 +31,7 @@ defineReplace(processSymbianLibraries) { } else { newLIB = "$${library}" } + contains(library, "\.dso$")|contains(library, ".lib$"):PRE_TARGETDEPS += $$library return($$newLIB) } @@ -38,13 +39,11 @@ for(libraries, LIBS) { newLIBS += $$processSymbianLibraries($$libraries) } LIBS = $$newLIBS -PRE_TARGETDEPS += $$replace(newLIBS, "-l", "") newLIBS = for(libraries, QMAKE_LIBS) { newLIBS += $$processSymbianLibraries($$libraries) } QMAKE_LIBS = $$newLIBS -PRE_TARGETDEPS += $$replace(newLIBS, "-l", "") linux-gcce { QMAKE_LIBS += -l:usrt2_2.lib \ diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index cff0138..b9e0ec8 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -178,8 +178,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << "export MACOSX_DEPLOYMENT_TARGET = " //exported to children processes << project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET") << endl; - if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) + if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) { t << "vpath %.dso " << project->values("QMAKE_LIBDIR").join(":") << endl; + t << "vpath %.lib " << project->values("QMAKE_LIBDIR").join(":") << endl; + } t << endl; -- cgit v0.12