Changeset 45

Timestamp:

Jun 23, 2009, 1:21:18 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: qconfig.h generation in progress.

Location:

trunk

Files:

• configure.cmd (modified) (13 diffs)
• src/corelib/arch/os2 (added)
• src/corelib/arch/os2/arch.pri (added)

trunk/configure.cmd

@@ -37 +37 @@
 G.QT_CONFIG         = ""
 G.SUPPORTED         = ""
+
+
 G.QMAKE_VARS_FILE   = ".qmake.vars"
 
@@ -168 +170 @@
     G.CFG_SVG = "yes"
     G.CFG_WEBKIT = "auto" /* (yes|no|auto) */
-
 /* @todo
     CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen"
@@ -180 +181 @@
     CFG_MOUSE_ON="pc linuxtp"   #default, see QMakeVar above
 */
-
     G.CFG_ARCH = ""
     G.CFG_HOST_ARCH = ""
@@ -195 +195 @@
     G.CFG_DECORATION_PLUGIN_AVAILABLE = ""
     G.CFG_DECORATION_PLUGIN = ""
+
     G.CFG_XINPUT = "runtime"
     G.CFG_XKB = "auto"
@@ -200 +201 @@
     G.CFG_CUPS = "auto"
     G.CFG_ICONV = "auto"
-    G.CFG_DBUS = "auto"
     G.CFG_GLIB = "auto"
     G.CFG_GSTREAMER = "auto"
+
+
+
+
     G.CFG_QGTKSTYLE = "auto"
     G.CFG_LARGEFILE = "auto"
-    G.CFG_OPENSSL = "auto"
     G.CFG_PTMALLOC = "no"
     G.CFG_STL = "auto"
@@ -211 +214 @@
     G.CFG_SEPARATE_DEBUG_INFO = "auto"
     G.CFG_REDUCE_EXPORTS = "auto"
+
+
     G.CFG_MMX = "auto"
     G.CFG_3DNOW = "auto"
     G.CFG_SSE = "auto"
     G.CFG_SSE2 = "auto"
-    G.CFG_REDUCE_RELOCATIONS = "no"
+    G.CFG_ = "no"
     G.CFG_IPV6 = "auto"
-    G.CFG_NAS = "no"
-    G.CFG_QWS_DEPTHS = "all"
-    G.CFG_USER_BUILD_KEY = ""
-    G.CFG_ACCESSIBILITY = "auto"
-    G.CFG_QT3SUPPORT = "yes"
-    G.CFG_ENDIAN = "auto"
-    G.CFG_HOST_ENDIAN = "auto"
-    G.CFG_DOUBLEFORMAT = "auto"
-    G.CFG_ARMFPA = "auto"
-    G.CFG_IWMMXT = "no"
     G.CFG_CLOCK_GETTIME = "auto"
     G.CFG_CLOCK_MONOTONIC = "auto"
@@ -234 +229 @@
     G.CFG_GETIFADDRS = "auto"
     G.CFG_INOTIFY = "auto"
-    G.CFG_RPATH = "yes"
+*/
+    G.CFG_USER_BUILD_KEY = ""
+    G.CFG_ACCESSIBILITY = "auto"
+    G.CFG_QT3SUPPORT = "yes"
+    G.CFG_ENDIAN = "auto"
+    G.CFG_HOST_ENDIAN = "auto"
+/* @todo do we really need this?
+    G.CFG_DOUBLEFORMAT = "auto"
+    G.CFG_ARMFPA = "auto"
     G.CFG_FRAMEWORK = "auto"
-    G.CFG_MAC_ARCHS = ""
-    G.CFG_MAC_DWARF2 = "auto"
-    G.CFG_MAC_XARCH = "auto"
-    G.CFG_MAC_CARBON = "yes"
-    G.CFG_MAC_COCOA = "auto"
-    G.COMMANDLINE_MAC_COCOA = "no"
+*/
     G.CFG_SXE = "no"
     G.CFG_PREFIX_INSTALL = "yes"
@@ -248 +246 @@
     G.I_FLAGS = ""
     G.L_FLAGS = ""
-    G.RPATH_FLAGS = ""
-    l_FLAGS = ""
+    G.l_FLAGS = ""
     G.QCONFIG_FLAGS = ""
     G.XPLATFORM = "" /* This seems to be the QMAKESPEC, like "linux-g++" */
@@ -276 +273 @@
     G.QT_HOST_PREFIX = ""
 
+
+
     /* flags for SQL drivers */
     G.QT_CFLAGS_PSQL = ""
@@ -356 +355 @@
 
     /* update QT_CONFIG to show our current predefined configuration */
-    w = wordpos(G.CFG_QCONFIG, "minimal small medium large full")
+    cfgs = "minimal small medium large full"
+    w = wordpos(G.CFG_QCONFIG, cfgs)
     if (w > 0) then do
         /* these are a sequence of increasing functionality */
         do i = 1 to w
-            G.QT_CONFIG = Join(G.QT_CONFIG, w"-config")
+            G.QT_CONFIG = Join(G.QT_CONFIG, w"-config")
         end
     end
@@ -629 +629 @@
     Makefile_str = charin(MakefilePlatform, 1, chars(MakefilePlatform))
     if (Makefile_str == "") then do
-        SayError "'"MakefilePlatform"' not found."
+        r "'"MakefilePlatform"' not found."
         call Done 1
     end
@@ -700 +700 @@
     if (make_rc \= 0)  then
         call Done 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+