Changeset 855


Ignore:
Timestamp:
May 13, 2011, 6:52:56 PM (9 years ago)
Author:
Dmitry A. Kuminov
Message:

gui: Improved r853 to make it actually biuld the mmx stuff.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gui/gui.pro

    r853 r855  
    8585} else {
    8686    win32-g++*|!win32:!win32-icc*:!macx-icc* {
     87        os2 {
     88            DRAWHELPER_OS2_COMPILER = $$QMAKE_RUN_CXX -Winline
     89            DRAWHELPER_OS2_COMPILER = $$replace(DRAWHELPER_OS2_COMPILER, \\$src, ${QMAKE_FILE_IN})
     90            DRAWHELPER_OS2_COMPILER = $$replace(DRAWHELPER_OS2_COMPILER, \\$obj, ${QMAKE_FILE_OUT})
     91        }
    8792        mmx {
    88             mmx_compiler.commands = $$QMAKE_CXX -c -Winline
     93            os2:mmx_compiler.commands = $$DRAWHELPER_OS2_COMPILER
     94            else:mmx_compiler.commands = $$QMAKE_CXX -c -Winline
    8995
    9096            mac {
     
    95101            }
    96102
    97             os2:mmx_compiler.commands += @$(CXXFLAGS_RSP) @$(INCPATH_RSP) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    98                         else:mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     103            !os2:mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    99104
    100105            mmx_compiler.dependency_type = TYPE_C
     
    107112        }
    108113        3dnow {
    109             mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
     114            os2:mmx3dnow_compiler.commands = $$DRAWHELPER_OS2_COMPILER
     115            else:mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
    110116
    111117            mac {
     
    116122            }
    117123
    118             os2:mmx3dnow_compiler.commands += @$(CXXFLAGS_RSP) @$(INCPATH_RSP) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    119             else:mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     124            !os2:mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    120125
    121126            mmx3dnow_compiler.dependency_type = TYPE_C
     
    128133
    129134            sse {
    130                 sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
     135                os2:sse3dnow_compiler.commands = $$DRAWHELPER_OS2_COMPILER
     136                else:sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
    131137
    132138                mac {
     
    137143                }
    138144
    139                 os2:sse3dnow_compiler.commands += @$(CXXFLAGS_RSP) @$(INCPATH_RSP) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    140                 else:sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     145                !os2:sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    141146
    142147                sse3dnow_compiler.dependency_type = TYPE_C
     
    150155        }
    151156        sse {
    152             sse_compiler.commands = $$QMAKE_CXX -c -Winline
     157            os2:sse_compiler.commands = $$DRAWHELPER_OS2_COMPILER
     158            else:sse_compiler.commands = $$QMAKE_CXX -c -Winline
    153159
    154160            mac {
     
    159165            }
    160166
    161             os2:sse_compiler.commands += @$(CXXFLAGS_RSP) @$(INCPATH_RSP) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    162             else:sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     167            !os2:sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    163168
    164169            sse_compiler.dependency_type = TYPE_C
     
    171176        }
    172177        sse2 {
    173             sse2_compiler.commands = $$QMAKE_CXX -c -Winline
     178            os2:sse2_compiler.commands = $$DRAWHELPER_OS2_COMPILER
     179            else:sse2_compiler.commands = $$QMAKE_CXX -c -Winline
    174180
    175181            mac {
     
    180186            }
    181187
    182             os2:sse2_compiler.commands += @$(CXXFLAGS_RSP) @$(INCPATH_RSP) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    183             else:sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     188            !os2:sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    184189
    185190            sse2_compiler.dependency_type = TYPE_C
     
    192197        }
    193198        ssse3 {
    194             ssse3_compiler.commands = $$QMAKE_CXX -c -Winline
     199            os2:ssse3_compiler.commands = $$DRAWHELPER_OS2_COMPILER
     200            else:ssse3_compiler.commands = $$QMAKE_CXX -c -Winline
    195201
    196202            mac {
     
    201207            }
    202208
    203             os2:ssse3_compiler.commands += @$(CXXFLAGS_RSP) @$(INCPATH_RSP) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    204             else:ssse3_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     209            !os2:ssse3_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    205210
    206211            ssse3_compiler.dependency_type = TYPE_C
     
    213218        }
    214219        iwmmxt {
    215             iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
     220            os2:iwmmxt_compiler.commands = $$DRAWHELPER_OS2_COMPILER
     221            else:iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
     222
    216223            iwmmxt_compiler.commands += -mcpu=iwmmxt
    217224
    218             os2:iwmmxt_compiler.commands += @$(CXXFLAGS_RSP) @$(INCPATH_RSP) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    219             else:iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     225            !os2:iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
    220226
    221227            iwmmxt_compiler.dependency_type = TYPE_C
Note: See TracChangeset for help on using the changeset viewer.