Changeset 417

Timestamp:

Dec 11, 2009, 1:28:58 AM (16 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.Compiler = ""
+    G.CompilerVersion = 0
+
     G.CFG_CONFIGURE_EXIT_ON_ERROR = "yes"
     G.CFG_PROFILE = "no"
@@ -491 +494 @@
     else G.QMAKESPEC = G.RelPath"\mkspecs\"G.PLATFORM
 
+    call CheckCompiler
+
     /* 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")
+
+    /* auto-detect precompiled header support */
+    if (G.CFG_PRECOMPILE == "auto") then do
+        /* @todo enable the below code once PCH actually work in GCC 4.4.2 */
+/*
+        if (G.Compiler == "g++") then do
+            if (G.CompilerVersion >= 030400) then
+                G.CFG_PRECOMPILE = "yes"
+            else
+                G.CFG_PRECOMPILE = "no"
+        end
+*/
+    end
 
     /* 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.QTCONFIG_CONFIG = Join(G.QTCONFIG_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
+
+/**
+ * Gets the information about the compiler from QMAKESPEC and from the
+ * compiler's executable and sets the following variables:
+ *
+ *  G.Compiler              - compiler name from the QMAKESPEC value (e.g. after '-')
+ *  G.CompilerVersion       - compiler version as a single number, for comparison
+ *  G.CompilerVersionString - compiler version as a string, for printing
+ */
+CheckCompiler: procedure expose (Globals)
+
+    parse var G.QMAKESPEC . "-" G.Compiler
+    select
+        when (G.Compiler == "g++") then do
+            address "cmd" "g++ --version | rxqueue.exe"
+            do while queued() <> 0
+                parse pull str
+                if (left(str, 10) == "g++ (GCC) ") then do
+                    parse value substr(str, 11) with G.CompilerVersionString " " .
+                    parse var G.CompilerVersionString x "." y "." z
+                    if (x == "") then x = 0
+                    if (y == "") then y = 0
+                    if (z == "") then z = 0
+                    G.CompilerVersion = x * 10000 + y * 100 + z
+                end
+            end
+        end
+    end
 
     return

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

@@ -32 +32 @@
 QMAKE_CFLAGS_DEBUG      = -g
 QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
+
+QMAKE_CFLAGS_PRECOMPILE     = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+QMAKE_CFLAGS_USE_PRECOMPILE = -include ${QMAKE_PCH_OUTPUT_BASE}
 
 QMAKE_CFLAGS_INCDIR     = -I