Changeset 617


Ignore:
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.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.cmd

    r590 r617  
    292292    G.CFG_SEPARATE_DEBUG_INFO = "auto"
    293293    G.CFG_IPV6 = "auto"
    294 /* @todo do we really need this?
    295294    G.CFG_MMX = "auto"
    296295    G.CFG_3DNOW = "auto"
    297296    G.CFG_SSE = "auto"
    298297    G.CFG_SSE2 = "auto"
    299     G.CFG_IWMMXT = "no"
     298/* @todo do we really need this?
    300299    G.CFG_CLOCK_GETTIME = "auto"
    301300    G.CFG_CLOCK_MONOTONIC = "auto"
    … …  
    970969    if (G.CFG_GRAPHICS_SYSTEM == "default") then G.CFG_GRAPHICS_SYSTEM = "raster"
    971970
     971    if (G.CFG_MMX == "auto")    then G.CFG_MMX = "yes"
     972    if (G.CFG_3DNOW == "auto")  then G.CFG_3DNOW = "yes"
     973    if (G.CFG_SSE == "auto")    then G.CFG_SSE = "yes"
     974    if (G.CFG_SSE2 == "auto")   then G.CFG_SSE2 = "yes"
     975
    972976    if (G.CFG_SM == "auto")             then G.CFG_SM = "yes"
    973977    if (G.CFG_STL == "auto")            then G.CFG_STL = "yes"
    … …  
    10581062        G.CFG_IPV6 = "no"
    10591063
     1064    if (G.CFG_MMX == "yes") then
     1065        G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "mmx")
     1066    if (G.CFG_3DNOW == "yes") then
     1067        G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "3dnow")
     1068    if (G.CFG_SSE == "yes") then
     1069        G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "sse")
     1070    if (G.CFG_SSE2 == "yes") then
     1071        G.QTCONFIG_CONFIG = Join(G.QTCONFIG_CONFIG, "sse2")
    10601072/* @todo do we really need this?
    1061     if (G.CFG_MMX == "yes") then
    1062         G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "mmx")
    1063     if (G.CFG_3DNOW == "yes") then
    1064         G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "3dnow")
    1065     if (G.CFG_SSE == "yes") then
    1066         G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "sse")
    1067     if (G.CFG_SSE2 == "yes") then
    1068         G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "sse2")
    1069     if (G.CFG_IWMMXT == "yes") then
    1070         G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "iwmmxt")
    10711073    if (G.CFG_CLOCK_GETTIME == "yes") then
    10721074        G.QT_CONFIG = Join(G.QT_CONFIG, "clock-gettime")
    … …  
    18191821    call SayLog "STL support ......... "G.CFG_STL
    18201822    call SayLog "PCH support ......... "G.CFG_PRECOMPILE
    1821 /* @todo do we really need this?
    1822     call SayLog "MMX/3DNOW/SSE/SSE2..  "G.CFG_MMX}"/"G.CFG_3DNOW"/"G.CFG_SSE"/"G.CFG_SSE2
    1823 */
     1823    call SayLog "MMX/3DNOW/SSE/SSE2..  "G.CFG_MMX"/"G.CFG_3DNOW"/"G.CFG_SSE"/"G.CFG_SSE2
    18241824    call SayLog "Graphics System ..... "G.CFG_GRAPHICS_SYSTEM
    18251825    call SayLog "IPv6 support ........ "G.CFG_IPV6

  • trunk/src/gui/painting/painting.pri

    r573 r617  
    244244    win32-g++|!win32:!*-icc* {
    245245        mmx {
    246             mmx_compiler.commands = $$QMAKE_CXX -c -Winline
     246            os2:mmx_compiler.commands = $$QMAKE_RUN_CXX -Winline
     247            else:mmx_compiler.commands = $$QMAKE_CXX -c -Winline
    247248
    248249            mac {
    … …  
    253254            }
    254255
    255             mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     256            os2 {
     257                mmx_compiler.commands = $$replace(mmx_compiler.commands, \\$src, ${QMAKE_FILE_IN})
     258                mmx_compiler.commands = $$replace(mmx_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
     259            } else {
     260                mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     261            }
    256262            mmx_compiler.dependency_type = TYPE_C
    257263            mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
    … …  
    263269        }
    264270        3dnow {
    265             mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
     271            os2:mmx3dnow_compiler.commands = $$QMAKE_RUN_CXX -Winline
     272            else:mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
    266273
    267274            mac {
    … …  
    272279            }
    273280
    274             mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     281            os2 {
     282                mmx3dnow_compiler.commands = $$replace(mmx3dnow_compiler.commands, \\$src, ${QMAKE_FILE_IN})
     283                mmx3dnow_compiler.commands = $$replace(mmx3dnow_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
     284            } else {
     285                mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     286            }
    275287            mmx3dnow_compiler.dependency_type = TYPE_C
    276288            mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
    … …  
    281293            QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
    282294            sse {
    283                 sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
     295                os2:sse3dnow_compiler.commands = $$QMAKE_RUN_CXX -Winline
     296                else:sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
    284297
    285298                mac {
    … …  
    290303                }
    291304
    292                 sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     305                os2 {
     306                    sse3dnow_compiler.commands = $$replace(sse3dnow_compiler.commands, \\$src, ${QMAKE_FILE_IN})
     307                    sse3dnow_compiler.commands = $$replace(sse3dnow_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
     308                } else {
     309                    sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     310                }
    293311                sse3dnow_compiler.dependency_type = TYPE_C
    294312                sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
    … …  
    301319        }
    302320        sse {
    303             sse_compiler.commands = $$QMAKE_CXX -c -Winline
     321            os2:sse_compiler.commands = $$QMAKE_RUN_CXX -Winline
     322            else:sse_compiler.commands = $$QMAKE_CXX -c -Winline
    304323
    305324            mac {
    … …  
    310329            }
    311330
    312             sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     331            os2 {
     332                sse_compiler.commands = $$replace(sse_compiler.commands, \\$src, ${QMAKE_FILE_IN})
     333                sse_compiler.commands = $$replace(sse_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
     334            } else {
     335                sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     336            }
    313337            sse_compiler.dependency_type = TYPE_C
    314338            sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
    … …  
    320344        }
    321345        sse2 {
    322             sse2_compiler.commands = $$QMAKE_CXX -c -Winline
     346            os2:sse2_compiler.commands = $$QMAKE_RUN_CXX -Winline
     347            else:sse2_compiler.commands = $$QMAKE_CXX -c -Winline
    323348
    324349            mac {
    … …  
    329354            }
    330355
    331             sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     356            os2 {
     357                sse2_compiler.commands = $$replace(sse2_compiler.commands, \\$src, ${QMAKE_FILE_IN})
     358                sse2_compiler.commands = $$replace(sse2_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
     359            } else {
     360                sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     361            }
    332362            sse2_compiler.dependency_type = TYPE_C
    333363            sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
    … …  
    339369        }
    340370        iwmmxt {
    341             iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
     371            os2:iwmmxt_compiler.commands = $$QMAKE_RUN_CXX -Winline
     372            else:iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
    342373            iwmmxt_compiler.commands += -mcpu=iwmmxt
    343             iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     374            os2 {
     375                iwmmxt_compiler.commands = $$replace(iwmmxt_compiler.commands, \\$src, ${QMAKE_FILE_IN})
     376                iwmmxt_compiler.commands = $$replace(iwmmxt_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
     377            } else {
     378                iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     379            }
    344380            iwmmxt_compiler.dependency_type = TYPE_C
    345381            iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
Note: See TracChangeset for help on using the changeset viewer.