Changeset 152 for trunk

Timestamp:

Nov 10, 2006, 1:30:20 AM (19 years ago)

Author:

dmik

Message:

qmake: GNUMAKE: Fixed: The -l prefix at the beginning of libraries specified in the LIBS project variable was not correctly processed resulting into double -l (-l-l<lib>) in the generated Makefile.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -638 +638 @@
         setMocAware(TRUE);
     
-    // add -L libs to libdir
+    // move -L<path> constructs to libdir and remove -l from the beginning of
+    // all other libraries (the correct linker switch will be set when
+    // generating the LIBS variable for the makefile in writeGNUParts())
     QStringList &libs = project->variables()["QMAKE_LIBS"];
     for ( QStringList::Iterator libit = libs.begin(); libit != libs.end();  ) {
@@ -645 +647 @@
             libit = libs.remove( libit );
         } else {
+            if ( (*libit).startsWith( "-l" ) )
+                *libit = (*libit).mid(2);
             ++libit;
         }