Index: /trunk/configure.cmd
===================================================================
--- /trunk/configure.cmd	(revision 616)
+++ /trunk/configure.cmd	(revision 617)
@@ -292,10 +292,9 @@
     G.CFG_SEPARATE_DEBUG_INFO = "auto"
     G.CFG_IPV6 = "auto"
-/* @todo do we really need this?
     G.CFG_MMX = "auto"
     G.CFG_3DNOW = "auto"
     G.CFG_SSE = "auto"
     G.CFG_SSE2 = "auto"
-    G.CFG_IWMMXT = "no"
+/* @todo do we really need this?
     G.CFG_CLOCK_GETTIME = "auto"
     G.CFG_CLOCK_MONOTONIC = "auto"
@@ -970,4 +969,9 @@
     if (G.CFG_GRAPHICS_SYSTEM == "default") then G.CFG_GRAPHICS_SYSTEM = "raster"
 
+    if (G.CFG_MMX == "auto")    then G.CFG_MMX = "yes"
+    if (G.CFG_3DNOW == "auto")  then G.CFG_3DNOW = "yes"
+    if (G.CFG_SSE == "auto")    then G.CFG_SSE = "yes"
+    if (G.CFG_SSE2 == "auto")   then G.CFG_SSE2 = "yes"
+
     if (G.CFG_SM == "auto")             then G.CFG_SM = "yes"
     if (G.CFG_STL == "auto")            then G.CFG_STL = "yes"
@@ -1058,15 +1062,13 @@
         G.CFG_IPV6 = "no"
 
+    if (G.CFG_MMX == "yes") then
+        G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "mmx")
+    if (G.CFG_3DNOW == "yes") then
+        G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "3dnow")
+    if (G.CFG_SSE == "yes") then
+        G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "sse")
+    if (G.CFG_SSE2 == "yes") then
+        G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "sse2")
 /* @todo do we really need this?
-    if (G.CFG_MMX == "yes") then
-        G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "mmx")
-    if (G.CFG_3DNOW == "yes") then
-        G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "3dnow")
-    if (G.CFG_SSE == "yes") then
-        G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "sse")
-    if (G.CFG_SSE2 == "yes") then
-        G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "sse2")
-    if (G.CFG_IWMMXT == "yes") then
-        G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "iwmmxt")
     if (G.CFG_CLOCK_GETTIME == "yes") then
         G.QT_CONFIG = Join(G.QT_CONFIG, "clock-gettime")
@@ -1819,7 +1821,5 @@
     call SayLog "STL support ......... "G.CFG_STL
     call SayLog "PCH support ......... "G.CFG_PRECOMPILE
-/* @todo do we really need this?
-    call SayLog "MMX/3DNOW/SSE/SSE2..  "G.CFG_MMX}"/"G.CFG_3DNOW"/"G.CFG_SSE"/"G.CFG_SSE2
-*/
+    call SayLog "MMX/3DNOW/SSE/SSE2..  "G.CFG_MMX"/"G.CFG_3DNOW"/"G.CFG_SSE"/"G.CFG_SSE2
     call SayLog "Graphics System ..... "G.CFG_GRAPHICS_SYSTEM
     call SayLog "IPv6 support ........ "G.CFG_IPV6
Index: /trunk/src/gui/painting/painting.pri
===================================================================
--- /trunk/src/gui/painting/painting.pri	(revision 616)
+++ /trunk/src/gui/painting/painting.pri	(revision 617)
@@ -244,5 +244,6 @@
     win32-g++|!win32:!*-icc* {
         mmx {
-            mmx_compiler.commands = $$QMAKE_CXX -c -Winline
+            os2:mmx_compiler.commands = $$QMAKE_RUN_CXX -Winline
+            else:mmx_compiler.commands = $$QMAKE_CXX -c -Winline
 
             mac {
@@ -253,5 +254,10 @@
             }
 
-            mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            os2 {
+                mmx_compiler.commands = $$replace(mmx_compiler.commands, \\$src, ${QMAKE_FILE_IN})
+                mmx_compiler.commands = $$replace(mmx_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
+            } else {
+                mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            }
             mmx_compiler.dependency_type = TYPE_C
             mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -263,5 +269,6 @@
         }
         3dnow {
-            mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
+            os2:mmx3dnow_compiler.commands = $$QMAKE_RUN_CXX -Winline
+            else:mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
 
             mac {
@@ -272,5 +279,10 @@
             }
 
-            mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            os2 {
+                mmx3dnow_compiler.commands = $$replace(mmx3dnow_compiler.commands, \\$src, ${QMAKE_FILE_IN})
+                mmx3dnow_compiler.commands = $$replace(mmx3dnow_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
+            } else {
+                mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            }
             mmx3dnow_compiler.dependency_type = TYPE_C
             mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -281,5 +293,6 @@
             QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
             sse {
-                sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
+                os2:sse3dnow_compiler.commands = $$QMAKE_RUN_CXX -Winline
+                else:sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
 
                 mac {
@@ -290,5 +303,10 @@
                 }
 
-                sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+                os2 {
+                    sse3dnow_compiler.commands = $$replace(sse3dnow_compiler.commands, \\$src, ${QMAKE_FILE_IN})
+                    sse3dnow_compiler.commands = $$replace(sse3dnow_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
+                } else {
+                    sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+                }
                 sse3dnow_compiler.dependency_type = TYPE_C
                 sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -301,5 +319,6 @@
         }
         sse {
-            sse_compiler.commands = $$QMAKE_CXX -c -Winline
+            os2:sse_compiler.commands = $$QMAKE_RUN_CXX -Winline
+            else:sse_compiler.commands = $$QMAKE_CXX -c -Winline
 
             mac {
@@ -310,5 +329,10 @@
             }
 
-            sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            os2 {
+                sse_compiler.commands = $$replace(sse_compiler.commands, \\$src, ${QMAKE_FILE_IN})
+                sse_compiler.commands = $$replace(sse_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
+            } else {
+                sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            }
             sse_compiler.dependency_type = TYPE_C
             sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -320,5 +344,6 @@
         }
         sse2 {
-            sse2_compiler.commands = $$QMAKE_CXX -c -Winline
+            os2:sse2_compiler.commands = $$QMAKE_RUN_CXX -Winline
+            else:sse2_compiler.commands = $$QMAKE_CXX -c -Winline
 
             mac {
@@ -329,5 +354,10 @@
             }
 
-            sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            os2 {
+                sse2_compiler.commands = $$replace(sse2_compiler.commands, \\$src, ${QMAKE_FILE_IN})
+                sse2_compiler.commands = $$replace(sse2_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
+            } else {
+                sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            }
             sse2_compiler.dependency_type = TYPE_C
             sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
@@ -339,7 +369,13 @@
         }
         iwmmxt {
-            iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
+            os2:iwmmxt_compiler.commands = $$QMAKE_RUN_CXX -Winline
+            else:iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
             iwmmxt_compiler.commands += -mcpu=iwmmxt
-            iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            os2 {
+                iwmmxt_compiler.commands = $$replace(iwmmxt_compiler.commands, \\$src, ${QMAKE_FILE_IN})
+                iwmmxt_compiler.commands = $$replace(iwmmxt_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
+            } else {
+                iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            }
             iwmmxt_compiler.dependency_type = TYPE_C
             iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
