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

Timestamp:

Jun 12, 2009, 1:32:11 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: More OS/2-specific fixes. Enabled GNUMakefileGenerator (turned on by MAKEFILE_GENERATOR=GNUMAKE).

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -60 +60 @@
 }
 
-bool GNUMakefileGenerator::isWindowsShell() const
-{
-#ifdef Q_OS_WIN
+bool GNUMakefileGenerator::isShell() const
+{
+#ifdef Q_OS_
     return Option::shellPath.isEmpty();
 #else
-    return Win32MakefileGenerator::isWindowsShell();
+    return Win32MakefileGenerator::isShell();
 #endif
 }
@@ -162 +162 @@
  }
 
+
 void createLdObjectScriptFile(const QString &fileName, const QStringList &objList)
 {
@@ -199 +200 @@
     }
 }
+
 
 void GNUMakefileGenerator::writeGNUParts(QTextStream &t)
@@ -368 +370 @@
             ar_script_file += "." + var("BUILD_NAME");
         }
+
         createArObjectScriptFile(ar_script_file, var("DEST_TARGET"), project->values("OBJECTS"));
+
         objectsLinkLine = "ar -M < " + ar_script_file;
     } else {
@@ -375 +379 @@
             ld_script_file += "." + var("BUILD_NAME");
         }
+
         createLdObjectScriptFile(ld_script_file, project->values("OBJECTS"));
+
         objectsLinkLine = ld_script_file;
     }