Changeset 417

Timestamp:

Dec 11, 2009, 1:28:58 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/os2-g++: Added support for precompiled headers on GCC >= 3.4.x (still inactive since GCC 4.4.2 traps when including a precompiled header).

Location:

trunk

Files:

• configure.cmd (modified) (7 diffs)
• mkspecs/os2-g++/qmake.conf (modified) (1 diff)

trunk/configure.cmd

@@ -212 +212 @@
 
     /* initalize internal variables */
+
+
+
     G.CFG_CONFIGURE_EXIT_ON_ERROR = "yes"
     G.CFG_PROFILE = "no"
@@ -491 +494 @@
     else G.QMAKESPEC = G.RelPath"\mkspecs\"G.PLATFORM
 
+
+
     /* Cross-builds are not supported */
     G.XPLATFORM = G.PLATFORM
@@ -548 +553 @@
     if (wordpos("libs", G.CFG_BUILD_PARTS) == 0) then
         G.CFG_BUILD_PARTS = Join(G.CFG_BUILD_PARTS, "libs")
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     /* detect the exepack program */
@@ -883 +901 @@
     end
 
-/* @todo later, when CFG_PRECOMPILE is implemented
     call QMakeVar "set", "PRECOMPILED_DIR", "tmp\pch\"G.QMAKE_OUTDIR
-*/
     call QMakeVar "set", "OBJECTS_DIR", "tmp\obj\"G.QMAKE_OUTDIR
     call QMakeVar "set", "MOC_DIR", "tmp\moc\"G.QMAKE_OUTDIR
@@ -893 +909 @@
     if (G.CFG_LARGEFILE == "yes") then
         G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "largefile")
+
     if (G.CFG_STL == "no") then
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_STL")
@@ -902 +919 @@
 
     if (G.CFG_PRECOMPILE == "yes") then
-        G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "precompile_header")
+        G.Q_CONFIG, "precompile_header")
 
     if (G.CFG_SEPARATE_DEBUG_INFO == "yes") then do
@@ -1789 +1806 @@
     call SaySay "To reconfigure, run '"G.MAKE" confclean' and 'configure.cmd'."
     call SaySay
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     return

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

@@ -32 +32 @@
 QMAKE_CFLAGS_DEBUG      = -g
 QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
+
+
+
 
 QMAKE_CFLAGS_INCDIR     = -I