Changeset 27 for trunk/qmake

Timestamp:

Jun 11, 2009, 6:33:38 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Added os2 mode (default on OS/2).

Location:

trunk/qmake

Files:

• generators/makefile.cpp (modified) (1 diff)
• generators/unix/unixmake.cpp (modified) (1 diff)
• option.cpp (modified) (4 diffs)
• option.h (modified) (1 diff)
• project.cpp (modified) (3 diffs)
• property.cpp (modified) (1 diff)

trunk/qmake/generators/makefile.cpp

@@ -2113 +2113 @@
     else if(Option::target_mode == Option::TARG_WIN_MODE)
         ret += " -win32";
+
+
     else if(Option::target_mode == Option::TARG_QNX6_MODE)
         ret += " -qnx6";

trunk/qmake/generators/unix/unixmake.cpp

@@ -783 +783 @@
             for(int i = 0; i < links.size(); ++i) {
                 if(Option::target_mode == Option::TARG_WIN_MODE ||
+
                    Option::target_mode == Option::TARG_MAC9_MODE) {
                 } else if(Option::target_mode == Option::TARG_UNIX_MODE ||

trunk/qmake/option.cpp

@@ -98 +98 @@
 #if defined(Q_OS_WIN32)
 Option::TARG_MODE Option::target_mode = Option::TARG_WIN_MODE;
+
+
 #elif defined(Q_OS_MAC)
 Option::TARG_MODE Option::target_mode = Option::TARG_MACX_MODE;
@@ -171 +173 @@
             "  -unix          Run in unix mode\n"
             "  -win32         Run in win32 mode\n"
+
             "  -macx          Run in Mac OS X mode\n"
             "  -d             Increase debug level\n"
@@ -243 +246 @@
             } else if(opt == "win32") {
                 Option::target_mode = TARG_WIN_MODE;
+
+
             } else if(opt == "d") {
                 Option::debug_level++;
@@ -511 +516 @@
 
     //defaults for globals
-    if(Option::target_mode == Option::TARG_WIN_MODE) {
+    if(Option::target_mode == Option::TARG_WIN_MODE ||
+       Option::target_mode == Option::TARG_OS2_MODE) {
         Option::dir_sep = "\\";
         Option::obj_ext = ".obj";

trunk/qmake/option.h

@@ -150 +150 @@
     static bool recursive;
     static QStringList before_user_vars, after_user_vars, user_configs, after_user_configs;
-    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_QNX6_MODE };
+    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_QNX6_MODE };
     static TARG_MODE target_mode;
     static QString user_template, user_template_prefix;

trunk/qmake/project.cpp

@@ -627 +627 @@
         case Option::TARG_WIN_MODE:
             concat << base_concat + QDir::separator() + "win32";
+
+
+
             break;
         case Option::TARG_MAC9_MODE:
@@ -1633 +1636 @@
     else if(Option::target_mode == Option::TARG_WIN_MODE && x == "win32")
         return true;
+
+
     QRegExp re(x, Qt::CaseSensitive, QRegExp::Wildcard);
     static QString spec;
@@ -1656 +1661 @@
         }
     }
-#elif defined(Q_OS_WIN)
+#elif defined(Q_OS_WIN)
     else if(spec == "default") {
         // We can't resolve symlinks as they do on Unix, so configure.exe puts the source of the

trunk/qmake/property.cpp

@@ -105 +105 @@
         return QLibraryInfo::location(QLibraryInfo::DemosPath);
     else if(v == "QMAKE_MKSPECS")
-        return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
+        return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE || 
+                                         Option::target_mode == Option::TARG_OS2_MODE ? ";" : ":");
     else if(v == "QMAKE_VERSION")
         return qmake_version();