Changeset 35

Timestamp:

Jun 17, 2009, 11:30:01 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/GNUMAKE: Overcome 1024 char CMD.EXE limitation with response files.

Location:

trunk

Files:

• mkspecs/os2-g++/qmake.conf (modified) (1 diff)
• qmake/generators/os2/gnumake.cpp (modified) (2 diffs)
• qmake/generators/os2/gnumake.h (modified) (1 diff)

trunk/mkspecs/os2-g++/qmake.conf

@@ -48 +48 @@
 QMAKE_LIBDIR_QT     = $$[QT_INSTALL_LIBS]
 
-QMAKE_RUN_CC        = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
-QMAKE_RUN_CC_IMP    = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-QMAKE_RUN_CXX       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
-QMAKE_RUN_CXX_IMP   = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+!isEmpty(QMAKE_SH) {
+    QMAKE_RUN_CC        = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
+    QMAKE_RUN_CC_IMP    = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+    QMAKE_RUN_CXX       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
+    QMAKE_RUN_CXX_IMP   = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+} else {
+    # we need response files because of CMD.EXE command line limit of 1024 chars
+    QMAKE_CFLAGS_RSP_VAR    = CFLAGS_RSP
+    QMAKE_CXXFLAGS_RSP_VAR  = CXXFLAGS_RSP
+    QMAKE_INCPATH_RSP_VAR   = INCPATH_RSP
+    QMAKE_OBJECTS_RSP_VAR   = OBJECTS_RSP
+    QMAKE_RUN_CC        = $(CC) -c @$(CFLAGS_RSP) @$(INCPATH_RSP) -o $obj $src
+    QMAKE_RUN_CC_IMP    = $(CC) -c @$(CFLAGS_RSP) @$(INCPATH_RSP) -o $@ $<
+    QMAKE_RUN_CXX       = $(CXX) -c @$(CXXFLAGS_RSP) @$(INCPATH_RSP) -o $obj $src
+    QMAKE_RUN_CXX_IMP   = $(CXX) -c @$(CXXFLAGS_RSP) @$(INCPATH_RSP) -o $@ $<
+}
 
 QMAKE_LINK          = g++

trunk/qmake/generators/os2/gnumake.cpp

@@ -338 +338 @@
 void GNUMakefileGenerator::writeObjectsPart(QTextStream &t)
 {
-    /* @todo generate response files for the linker to overcome the 1024 chars
-     * CMD.EXE limitation */
     Win32MakefileGenerator::writeObjectsPart(t);
+
+
+
+
+
 }
 
@@ -428 +431 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE

trunk/qmake/generators/os2/gnumake.h

@@ -79 +79 @@
     QString maybeQuotePath(const QString &path);
 
+
+
+
+
+
     bool init_flag;
     QString quote;