diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-16 14:29:48 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-27 16:29:38 +0200 |
commit | 022f8ebd1387623c5d524c7dc71ae3237ff05d81 (patch) | |
tree | 157c99d9f3f4b4b40820522f3adca79cce8d9397 /qmake/generators/win32/mingw_make.cpp | |
parent | 10fba42d714ad97538bbd0be6bc0b7fcb19d4688 (diff) |
merge QMAKE_LIBDIR into QMAKE_LIBS early
dealing with the directories separately doesn't buy us anything. it's
easier to mix them into the libs, as that contains some paths, too, both
in projects and in prl files.
this brings the windows generators in line with the unix ones.
Change-Id: I1f58f7edd8e21d28bfabf04384bac2e315aaf446
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/generators/win32/mingw_make.cpp')
-rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index fd7f07aedd..cb83f25a80 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -74,13 +74,6 @@ QString MingwMakefileGenerator::getLibTarget() bool MingwMakefileGenerator::findLibraries() { QList<QMakeLocalFileName> dirs; - { - const QStringList &libpaths = project->values("QMAKE_LIBDIR"); - for (QStringList::ConstIterator libpathit = libpaths.begin(); - libpathit != libpaths.end(); ++libpathit) - dirs.append(QMakeLocalFileName((*libpathit))); - } - const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() }; for (int i = 0; !lflags[i].isNull(); i++) { QStringList &l = project->values(lflags[i]); @@ -259,6 +252,8 @@ void MingwMakefileGenerator::init() project->values("TARGET_PRL").append(project->first("TARGET")); + project->values("QMAKE_L_FLAG") << "-L"; + processVars(); if (!project->values("RES_FILE").isEmpty()) { @@ -341,25 +336,12 @@ void MingwMakefileGenerator::writeLibsPart(QTextStream &t) } else { t << "LINK = " << var("QMAKE_LINK") << endl; t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl; - t << "LIBS = "; - if(!project->values("QMAKE_LIBDIR").isEmpty()) - writeLibDirPart(t); - t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << ' ' + t << "LIBS = " + << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << ' ' << var("QMAKE_LIBS_PRIVATE").replace(QRegExp("(\\slib|^lib)")," -l") << endl; } } -void MingwMakefileGenerator::writeLibDirPart(QTextStream &t) -{ - QStringList libDirs = project->values("QMAKE_LIBDIR"); - for (int i = 0; i < libDirs.size(); ++i) { - libDirs[i].remove("\""); - if (libDirs[i].endsWith("\\")) - libDirs[i].chop(1); - } - t << valGlue(libDirs, "-L" + quote, quote + " -L" + quote, quote) << " "; -} - void MingwMakefileGenerator::writeObjectsPart(QTextStream &t) { if (project->values("OBJECTS").count() < var("QMAKE_LINK_OBJECT_MAX").toInt()) { |