From 8fa9249acc37ea8ae41a25bbb7444560663985f7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Jul 2012 22:02:50 +0200 Subject: [PATCH] $$QMAKE_LIBDIR contents belong into $(LIBS), not $(LFLAGS) unlike for the unix linker, this does not matter for the windows linker, but keeping it consistent has advantages. Change-Id: Ib9b9efa18c31d87c026d3cac5a8737f4612ad1c0 Reviewed-by: Friedemann Kleint --- qmake/generators/win32/winmakefile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 2af7b81..574d348 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -764,11 +764,11 @@ void Win32MakefileGenerator::writeLibsPart(QTextStream &t) t << "LIBFLAGS = " << var("QMAKE_LIBFLAGS") << endl; } else { t << "LINK = " << var("QMAKE_LINK") << endl; - t << "LFLAGS = "; + t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl; + t << "LIBS = "; if(!project->values("QMAKE_LIBDIR").isEmpty()) writeLibDirPart(t); - t << var("QMAKE_LFLAGS") << endl; - t << "LIBS = " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; + t << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; } } -- 2.7.4