Changeset 882 for trunk/qmake/generators/os2/gnumake.cpp

Timestamp:

Jul 7, 2011, 1:55:27 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Fixed shadow build support. Closes #220 [based on a patch by rudi].

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -424 +424 @@
         && 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");
@@ -430 +430 @@
 
         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();
@@ -565 +565 @@
 {
     if (!project->isEmpty("RC_FILE")) {
-        t << "RC_FILE       = " << escapeFilePath(var("RC_FILE")) << endl;
+        t << "RC_FILE       = " << escapeFilePath(fileFixify(var("RC_FILE"))) << endl;
     }
     if (!project->isEmpty("RES_FILE")) {
-        t << "RES_FILE      = " << valList(escapeFilePaths(project->values("RES_FILE"))) << endl;
+        t << "RES_FILE      = " << valList(escapeFilePaths(fileFixify(project->values("RES_FILE")))) << endl;
     }
 
@@ -589 +589 @@
             }
             if (!project->isEmpty("DEF_FILE_TEMPLATE")) {
-                t << "DEF_FILE_TEMPLATE       = " << escapeFilePath(var("DEF_FILE_TEMPLATE")) << endl;
+                t << "DEF_FILE_TEMPLATE       = " << escapeFilePath(fileFixify(var("DEF_FILE_TEMPLATE"))) << endl;
                 haveSomething = true;
             }
             if (!project->isEmpty("DEF_FILE_MAP")) {
-                t << "DEF_FILE_MAP            = " << escapeFilePath(var("DEF_FILE_MAP")) << endl;
+                t << "DEF_FILE_MAP            = " << escapeFilePath(fileFixify(var("DEF_FILE_MAP"))) << endl;
                 haveSomething = true;
             }
@@ -601 +601 @@
             } else if (haveSomething) {
                 // the EXE needs it only if there's a description info
-                t << "DEF_FILE_EXETYPE        = " << escapeFilePath(var("DEF_FILE_EXETYPE")) << endl;
+                t << "DEF_FILE_EXETYPE        = " << var("DEF_FILE_EXETYPE") << endl;
                 t << "DEF_FILE      = $(OBJECTS_DIR)\\$(TARGET).def" << endl;
             }
@@ -610 +610 @@
                 exit(1);
             }
-            t << "DEF_FILE      = " << escapeFilePath(var("DEF_FILE")) << endl;
+            t << "DEF_FILE      = " << escapeFilePath(fileFixify(var("DEF_FILE"))) << endl;
         }
     }
@@ -643 +643 @@
             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)";
     }
 
@@ -719 +719 @@
     QString filePath = project->first("OBJECTS_DIR");
     if (filePath.isEmpty())
-        filePath = Option::output_dir;
+        filePath = fileFixify(Option::output_dir);
     filePath = Option::fixPathToTargetOS(filePath + QDir::separator() + fileName);
     return filePath;
@@ -741 +741 @@
             QString fileName = makeResponseFileName(vars[i]);
             t << rspVar.leftJustified(14) << "= " << fileName << endl;
-            QFile file(fileName);
+            QFile file(QDir(Option::output_dir).absoluteFilePath(fileName));
             if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
                 QTextStream rt(&file);
@@ -772 +772 @@
         QString fileName = makeResponseFileName("OBJECTS");
         t << var.leftJustified(14) << "= " << fileName << endl;
-        QFile file(fileName);
+        QFile file(QDir(Option::output_dir).absoluteFilePath(fileName));
         if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
             QTextStream rt(&file);