Changeset 617 for trunk/src

Timestamp:

Mar 1, 2010, 9:38:12 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Enabled MMX/SSE support (on by default), see #48 for details.

File:

• trunk/src/gui/painting/painting.pri (modified) (11 diffs)

trunk/src/gui/painting/painting.pri

@@ -244 +244 @@
     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 +254 @@
             }
 
-            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 +269 @@
         }
         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 +279 @@
             }
 
-            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 +293 @@
             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 +303 @@
                 }
 
-                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 +319 @@
         }
         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 +329 @@
             }
 
-            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 +344 @@
         }
         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 +354 @@
             }
 
-            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 +369 @@
         }
         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)}