Changeset 312

Timestamp:

Nov 10, 2009, 10:16:15 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Cleanup.

File:

• trunk/configure.cmd (modified) (7 diffs)

trunk/configure.cmd

@@ -182 +182 @@
     call QMakeVar "add", "styles", "cde mac motif plastique cleanlooks windows"
     call QMakeVar "add", "decorations", "default windows styled"
-/*
-    @todo
-    QMakeVar add gfx-drivers "linuxfb"
-    QMakeVar add kbd-drivers "tty"
-    QMakeVar add mouse-drivers "pc linuxtp"
-*/
 
     /* @todo cleanup the option list below when it's clear which options are
@@ -205 +199 @@
     G.CFG_SHARED = "yes"
     G.CFG_SM = "auto"
-/* @todo
-    G.CFG_XSHAPE = "auto"
-    G.CFG_XINERAMA = "runtime"
-    G.CFG_XFIXES = "runtime"
-*/
     G.CFG_ZLIB = "auto"
     G.CFG_SQLITE = "qt"
@@ -221 +210 @@
     G.CFG_MNG = "auto"
     G.CFG_LIBMNG = "auto"
-/* @todo
-    G.CFG_XCURSOR = "runtime"
-    G.CFG_XRANDR = "runtime"
-    G.CFG_XRENDER = "auto"
-    G.CFG_MITSHM = "auto"
-*/
     G.CFG_OPENGL = "auto"
     G.CFG_SSE = "auto"
@@ -239 +222 @@
     G.CFG_SVG = "yes"
     G.CFG_WEBKIT = "auto" /* (yes|no|auto) */
-/* @todo
-    CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen"
-    CFG_GFX_ON="linuxfb multiscreen"
-    CFG_GFX_PLUGIN_AVAILABLE=
-    CFG_GFX_PLUGIN=
-    CFG_GFX_OFF=
-    CFG_KBD_AVAILABLE="tty usb sl5000 yopy vr41xx qvfb"
-    CFG_KBD_ON="tty"    #default, see QMakeVar above
-    CFG_MOUSE_AVAILABLE="pc bus linuxtp yopy vr41xx tslib qvfb"
-    CFG_MOUSE_ON="pc linuxtp"   #default, see QMakeVar above
-*/
+    G.CFG_GFX_AVAILABLE = ""
+    G.CFG_GFX_ON = ""
+    G.CFG_GFX_PLUGIN_AVAILABLE = ""
+    G.CFG_GFX_PLUGIN = ""
+    G.CFG_GFX_OFF = ""
     G.CFG_ARCH = ""
     G.CFG_HOST_ARCH = ""
@@ -265 +242 @@
     G.CFG_DECORATION_PLUGIN = ""
 /* @todo do we really need this?
-    G.CFG_XINPUT = "runtime"
-    G.CFG_XKB = "auto"
     G.CFG_NIS = "auto"
     G.CFG_CUPS = "auto"
@@ -304 +279 @@
     G.CFG_HOST_ENDIAN = "auto"
 /* @todo do we really need this?
-    G.CFG_DOUBLEFORMAT = "auto"
-    G.CFG_ARMFPA = "auto"
     G.CFG_FRAMEWORK = "auto"
 */
@@ -1318 +1291 @@
     if (G.CFG_SM == "no") then
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_SESSIONMANAGER")
-    if (G.CFG_XCURSOR == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XCURSOR")
-    if (G.CFG_XFIXES == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XFIXES")
-    if (G.CFG_XINERAMA == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XINERAMA")
-    if (G.CFG_XKB == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XKB")
-    if (G.CFG_XRANDR == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XRANDR")
-    if (G.CFG_XRENDER == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XRENDER")
-    if (G.CFG_MITSHM == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_MITSHM")
-    if (G.CFG_XSHAPE == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_SHAPE")
-    if (G.CFG_XINPUT == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XINPUT "QT_NO_TABLET")
-
-    if (G.CFG_XCURSOR == "runtime") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_RUNTIME_XCURSOR")
-    if (G.CFG_XINERAMA == "runtime") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_RUNTIME_XINERAMA")
-    if (G.CFG_XFIXES == "runtime") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_RUNTIME_XFIXES")
-    if (G.CFG_XRANDR == "runtime") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_RUNTIME_XRANDR")
-    if (G.CFG_XINPUT == "runtime") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_RUNTIME_XINPUT")
 */