Changeset 29 for trunk/qmake/generators/makefile.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/makefile.cpp (modified) (4 diffs)

trunk/qmake/generators/makefile.cpp

@@ -100 +100 @@
         ret += dir;
     ret += " ";
-    if(isWindowsShell())
+    if(isDosLikeShell())
         ret += "$(MKDIR)";
     else
@@ -125 +125 @@
     }
     bool ret = true;
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
     bool driveExists = true;
     if(!QDir::isRelativePath(path)) {
@@ -1191 +1191 @@
 {
     QString rm_dir_contents("-$(DEL_FILE)");
-    if (!isWindowsShell()) //ick
+    if (!isDosLikeShell()) //ick
         rm_dir_contents = "-$(DEL_FILE) -r";
 
@@ -1342 +1342 @@
             for(QStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) {
                 QString tmp_dst = fileFixify((*pit), FileFixifyAbsolute, false);
-                if (!isWindowsShell() && tmp_dst.right(1) != Option::dir_sep)
+                if (!isDosLikeShell() && tmp_dst.right(1) != Option::dir_sep)
                     tmp_dst += Option::dir_sep;
                 t << mkdir_p_asstring(filePrefixRoot(root, tmp_dst)) << "\n\t";