Ticket #220: gnumake.diff

gnumake.cpp

@@ -423 +423 @@
     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 +
@@ -563 +563 @@
 void GNUMakefileGenerator::writeRcAndDefVariables(QTextStream &t)
 {
     if (!project->isEmpty("RC_FILE")) {
-        t << "RC_FILE       = " << escapeFilePath(var("RC_FILE")) << endl;
+        QString rcFile = fileFixify(var("RC_FILE"), Option::output_dir,
+                                    qmake_getpwd(), FileFixifyRelative);
+        t << "RC_FILE       = " << escapeFilePath(rcFile) << endl;
     }
     if (!project->isEmpty("RES_FILE")) {
         t << "RES_FILE      = " << valList(escapeFilePaths(project->values("RES_FILE"))) << endl;
@@ -638 +640 @@
             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"))
@@ -712 +714 @@
         fileName += "." + var("BUILD_NAME");
     }
     fileName += ".rsp";
+
     QString filePath = project->first("OBJECTS_DIR");
     if (filePath.isEmpty())
-        filePath = Option::output_dir;
-    filePath = Option::fixPathToTargetOS(filePath + QDir::separator() + fileName);
-    return filePath;
+        fileName = fileFixify(fileName, Option::output_dir,
+                              qmake_getpwd(), FileFixifyRelative);
+    else
+        fileName = Option::fixPathToTargetOS(filePath + '/' + fileName);
+
+    return fileName;
 }
 
 void GNUMakefileGenerator::createCompilerResponseFiles(QTextStream &t)
@@ -736 +742 @@
         if (!rspVar.isEmpty()) {
             QString fileName = makeResponseFileName(vars[i]);
             t << rspVar.leftJustified(14) << "= " << fileName << endl;
-            QFile file(fileName);
+            QFile file(Option::output_dir + fileName);
             if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
                 QTextStream rt(&file);
                 if (!qstrcmp(vars[i], "CFLAGS")) {
@@ -767 +773 @@
     if (!var.isEmpty()) {
         QString fileName = makeResponseFileName("OBJECTS");
         t << var.leftJustified(14) << "= " << fileName << endl;
-        QFile file(fileName);
+        QFile file(Option::output_dir + fileName);
         if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
             QTextStream rt(&file);
             rt << varGlue("OBJECTS", QString::null, "\n", "\n");