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

Timestamp:

Jul 29, 2009, 8:57:31 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/OS/2: Added DEFINES_RSP file generation to overcome command line length limitation when calling moc (#23).

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -535 +535 @@
 void GNUMakefileGenerator::createCompilerResponseFiles(QTextStream &t)
 {
-    static const char *vars[] = { "CFLAGS",   /*<=*/ "QMAKE_CFLAGS",
-                                  "CXXFLAGS", /*<=*/ "QMAKE_CXXFLAGS",
-                                  "INCPATH",  /*<=*/ "INCLUDEPATH" };
+    static const char *vars[] = { "CFLAGS", "CXXFLAGS", "DEFINES", "INCPATH" };
 
     /* QMAKE_XXX_RSP_VAR is used as a flag whether it is necessary to
@@ -546 +544 @@
      * other places of qmake.conf (e.g. rules) */
 
-    for (size_t i = 0; i < sizeof(vars)/sizeof(vars[0]); i+=2) {
+    for (size_t i = 0; i < sizeof(vars)/sizeof(vars[0]); ) {
         QString rspVar =
             project->first(QString().sprintf("QMAKE_%s_RSP_VAR", vars[i]));
@@ -555 +553 @@
             if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
                 QTextStream rt(&file);
-                if (!qstrcmp(vars[i+1], "INCLUDEPATH")) {
+                if (!qstrcmp(vars[i], "CFLAGS")) {
+                    rt << varGlue("QMAKE_CFLAGS", QString::null, "\n", "\n");
+                } else if (!qstrcmp(vars[i], "CXXFLAGS")) {
+                    rt << varGlue("QMAKE_CXXFLAGS", QString::null, "\n", "\n");
+                } else if (!qstrcmp(vars[i], "DEFINES")) {
+                    rt << varGlue("PRL_EXPORT_DEFINES", "-D", "\n-D", "\n")
+                       << varGlue("DEFINES", "-D", "\n-D", "\n");
+                } else if (!qstrcmp(vars[i], "INCPATH")) {
                     QString opt = var("QMAKE_CFLAGS_INCDIR");
-                    rt << varGlue(vars[i+1], opt, "\n" + opt, "\n");
+                    rt << varGlue(, opt, "\n" + opt, "\n");
                 } else {
-                    rt << varGlue(vars[i+1], QString::null, "\n", "\n")
-                       << varGlue("PRL_EXPORT_DEFINES", "-D", "\n-D", "\n")
-                       << varGlue("DEFINES", "-D", "\n-D", "\n");
+                    Q_ASSERT(false);
                 }
                 rt.flush();