Ticket #196: gnumake.diff

gnumake.cpp

@@ -213 +213 @@
     QStringList seen;
 
     for (QStringList::Iterator it = libs.begin(); it != libs.end(); /*below*/) {
-        QString &lib = *it;
+        QString &lib = *it;
 
+        if (lib.startsWith("\"") && lib.endsWith("\""))
+            lib = lib.mid(1, lib.length()-2);
+        
         if (lib.startsWith("-L")) {
             // this is a library path
-            dirs.append(QMakeLocalFileName((*it).mid(2)));
+            dirs.append(QMakeLocalFileName(lib.mid(2)));
             ++it;
             continue;
         }
@@ -423 +426 @@
     if (!project->first("PRECOMPILED_HEADER").isEmpty()
         && project->isActiveConfig("precompile_header")) {
         QString preCompHeader = var("PRECOMPILED_DIR")
-                         + QFileInfo(project->first("PRECOMPILED_HEADER")).fileName();
+                         + QFileInfo(project->first("PRECOMPILED_HEADER")).fileName();
         preCompHeaderOut = preCompHeader + ".gch";
         project->values("QMAKE_CLEAN").append(preCompHeaderOut + Option::dir_sep + "c");
         project->values("QMAKE_CLEAN").append(preCompHeaderOut + Option::dir_sep + "c++");
 
         project->values("QMAKE_RUN_CC").clear();
-            project->values("QMAKE_RUN_CC").append("$(CC) -c -include " + preCompHeader +
+            project->values("QMAKE_RUN_CC").append("$(CC) -c -include " + preCompHeader +
                                                " $(CFLAGS) $(INCPATH) -o $obj $src");
         project->values("QMAKE_RUN_CC_IMP").clear();
         project->values("QMAKE_RUN_CC_IMP").append("$(CC)  -c -include " + preCompHeader +
@@ -489 +492 @@
         foreach(const QString &libVar, libVars) {
             QStringList libs = project->values(libVar);
             for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it) {
-                QString lib = escapeFilePath(*it);
+                QString &lib = *it;
+
+                if (lib.startsWith("\"") && lib.endsWith("\""))
+                   lib = lib.mid(1, lib.length()-2);
+
                 /* lib may be prefixed with -l which is commonly used in e.g. PRF
                  * (feature) files on all platforms; remove it before prepending
                  * the compiler-specific option. There is even more weird case
@@ -497 +504 @@
                  * this as well and replace it with the proper option. */
                 if (lib.startsWith("-L")) {
                     lib = lib.mid(2);
-                    t << " " << optL << lib;
+                    t << " " << escapeFilePath(optL + lib);
                 } else {
                     if (lib.startsWith("-l"))
                         lib = lib.mid(2);
-                    t << " " << opt << lib;
+                    t << " " << escapeFilePath(opt + lib);
                 }
             }
         }
@@ -638 +645 @@
             fprintf(stderr, "Please specify one of them, not both.");
             exit(1);
         }
-        project->values("RES_FILE").prepend(escapeFilePath(QString("$(OBJECTS_DIR)") +
+        project->values("RES_FILE").prepend(escapeFilePath(QString("$(OBJECTS_DIR)") +
                                                            QDir::separator() +
                                                            QFileInfo(var("RC_FILE")).baseName() +
                                                            ".res"));
-        project->values("CLEAN_FILES") += "$(RES_FILE)";
+        project->values("CLEAN_FILES") += "$(RES_FILE)";
     }
 
     if (!project->isEmpty("RES_FILE"))