Changeset 853


Ignore:
Timestamp:
May 13, 2011, 5:05:57 PM (9 years ago)
Author:
Dmitry A. Kuminov
Message:

gui: Fixed incorrect compiler calling when building mmx/sse helpers on OS/2.

File:
1 edited

Legend:

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

    r846 r853  
    9595            }
    9696
    97             mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     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}
     99
    98100            mmx_compiler.dependency_type = TYPE_C
    99101            mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
     
    114116            }
    115117
    116             mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     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}
     120
    117121            mmx3dnow_compiler.dependency_type = TYPE_C
    118122            mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
     
    122126            silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
    123127            QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
     128
    124129            sse {
    125130                sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
     
    132137                }
    133138
    134                 sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     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}
     141
    135142                sse3dnow_compiler.dependency_type = TYPE_C
    136143                sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
     
    152159            }
    153160
    154             sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     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}
     163
    155164            sse_compiler.dependency_type = TYPE_C
    156165            sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
     
    171180            }
    172181
    173             sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     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}
     184
    174185            sse2_compiler.dependency_type = TYPE_C
    175186            sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
     
    190201            }
    191202
    192             ssse3_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     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}
     205
    193206            ssse3_compiler.dependency_type = TYPE_C
    194207            ssse3_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
     
    202215            iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
    203216            iwmmxt_compiler.commands += -mcpu=iwmmxt
    204             iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     217
     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}
     220
    205221            iwmmxt_compiler.dependency_type = TYPE_C
    206222            iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
Note: See TracChangeset for help on using the changeset viewer.