Changeset 847

Timestamp:

May 6, 2011, 7:26:50 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Fixed the OS/2 build and the GNUMAKE generator.

Location:

trunk/qmake

Files:

• Makefile.os2-g++ (modified) (1 diff)
• generators/makefile.cpp (modified) (1 diff)
• generators/metamakefile.cpp (modified) (1 diff)
• generators/symbian/symmake_abld.cpp (modified) (1 diff)
• option.cpp (modified) (1 diff)
• project.cpp (modified) (1 diff)

trunk/qmake/Makefile.os2-g++

@@ -64 +64 @@
                 generators/win32/msvc_nmake.cpp \
                 generators/projectgenerator.cpp \
-                generators/win32/msvc_dsp.cpp \
                 generators/win32/msvc_vcproj.cpp \
+                generators/win32/msvc_vcxproj.cpp \
                 generators/win32/msvc_objectmodel.cpp \
+                generators/win32/msbuild_objectmodel.cpp \
                 generators/symbian/symmake.cpp \
                 generators/symbian/symmake_abld.cpp \
                 generators/symbian/symmake_sbsv2.cpp \
                 generators/symbian/initprojectdeploy_symbian.cpp \
+                generators/symbian/symbiancommon.cpp \
                 generators/os2/gnumake.cpp
 

trunk/qmake/generators/makefile.cpp

@@ -1884 +1884 @@
                 Option::target_mode == Option::TARG_OS2_MODE ?
                     QString(" >nul 2>&1") : // reduce noise
-                isForSymbian() ?
-                    QString(" 2> NUL") :
                     QString::null;
 

trunk/qmake/generators/metamakefile.cpp

@@ -557 +557 @@
 #endif
         *target_mode = Option::TARG_SYMBIAN_MODE;
+    } else if (gen == "GNUMAKE") {
+        *host_mode = Option::HOST_OS2_MODE;
+        *target_mode = Option::TARG_OS2_MODE;
     } else {
         fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());

trunk/qmake/generators/symbian/symmake_abld.cpp

@@ -320 +320 @@
                     dirsToClean << fixedValue;
                     t << "\t-@ " << dirExists << " \""  << fixedValue << "\" "
-                      << (isWindowsShell() ? "" : "|| ")
+                      << (isDosLikeShell() ? "" : "|| ")
                       << mkdir << " \"" << fixedValue << "\"" << endl;
                 }

trunk/qmake/option.cpp

@@ -263 +263 @@
             } else if(opt == "os2") {
                 fprintf(stderr, "-os2 is deprecated.\n");
-                Option::host_mode = TARG_OS2_MODE;
+                Option::host_mode = HOST_OS2_MODE;
                 Option::target_mode = TARG_OS2_MODE;
                 Option::target_mode_overridden = true;

trunk/qmake/project.cpp

@@ -1517 +1517 @@
                     else if (os == "win32")
                         Option::target_mode = Option::TARG_WIN_MODE;
+                    else if (os == "os2")
+                        Option::target_mode = Option::TARG_OS2_MODE;
                     else
                         fprintf(stderr, "Unknown target platform specified: %s\n",