Remove unused MMX/3DNOW/SSE/SSE2/SSSE3/NEON custom compiler logic
The QtWidgets module doesn't contain any code that needs these custom compilers (that code has been move to QtGui). Change-Id: I655e478908bfa0b646e68210f6215d9ffbb1f81e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Bradley T. Hughes
Qt by Nokia
parent
08c2368911
commit
b36e6c4319
@ -46,166 +46,8 @@ QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist
|
|||||||
|
|
||||||
DEFINES += Q_INTERNAL_QAPP_SRC
|
DEFINES += Q_INTERNAL_QAPP_SRC
|
||||||
|
|
||||||
neon:*-g++* {
|
|
||||||
DEFINES += QT_HAVE_NEON
|
|
||||||
HEADERS += $$NEON_HEADERS
|
|
||||||
|
|
||||||
DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM
|
|
||||||
|
|
||||||
neon_compiler.commands = $$QMAKE_CXX -c
|
|
||||||
neon_compiler.commands += $(CXXFLAGS) -mfpu=neon $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
|
||||||
neon_compiler.dependency_type = TYPE_C
|
|
||||||
neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
|
|
||||||
neon_compiler.input = DRAWHELPER_NEON_ASM_FILES NEON_SOURCES
|
|
||||||
neon_compiler.variable_out = OBJECTS
|
|
||||||
neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN}
|
|
||||||
silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands
|
|
||||||
QMAKE_EXTRA_COMPILERS += neon_compiler
|
|
||||||
}
|
|
||||||
|
|
||||||
INCLUDEPATH += ../3rdparty/harfbuzz/src
|
INCLUDEPATH += ../3rdparty/harfbuzz/src
|
||||||
|
|
||||||
win32:!contains(QT_CONFIG, directwrite) {
|
win32:!contains(QT_CONFIG, directwrite) {
|
||||||
DEFINES += QT_NO_DIRECTWRITE
|
DEFINES += QT_NO_DIRECTWRITE
|
||||||
}
|
}
|
||||||
|
|
||||||
contains(QMAKE_MAC_XARCH, no) {
|
|
||||||
DEFINES += QT_NO_MAC_XARCH
|
|
||||||
} else {
|
|
||||||
win32-g++*|!win32:!win32-icc*:!macx-icc* {
|
|
||||||
mmx {
|
|
||||||
mmx_compiler.commands = $$QMAKE_CXX -c -Winline
|
|
||||||
|
|
||||||
mac {
|
|
||||||
mmx_compiler.commands += -Xarch_i386 -mmmx
|
|
||||||
mmx_compiler.commands += -Xarch_x86_64 -mmmx
|
|
||||||
} else {
|
|
||||||
mmx_compiler.commands += -mmmx
|
|
||||||
}
|
|
||||||
|
|
||||||
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)}
|
|
||||||
mmx_compiler.input = MMX_SOURCES
|
|
||||||
mmx_compiler.variable_out = OBJECTS
|
|
||||||
mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
|
|
||||||
silent:mmx_compiler.commands = @echo compiling[mmx] ${QMAKE_FILE_IN} && $$mmx_compiler.commands
|
|
||||||
QMAKE_EXTRA_COMPILERS += mmx_compiler
|
|
||||||
}
|
|
||||||
3dnow {
|
|
||||||
mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
|
|
||||||
|
|
||||||
mac {
|
|
||||||
mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx
|
|
||||||
mmx3dnow_compiler.commands += -Xarch_x86_64 -m3dnow -Xarch_x86_64 -mmmx
|
|
||||||
} else {
|
|
||||||
mmx3dnow_compiler.commands += -m3dnow -mmmx
|
|
||||||
}
|
|
||||||
|
|
||||||
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)}
|
|
||||||
mmx3dnow_compiler.input = MMX3DNOW_SOURCES
|
|
||||||
mmx3dnow_compiler.variable_out = OBJECTS
|
|
||||||
mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN}
|
|
||||||
silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
|
|
||||||
QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
|
|
||||||
sse {
|
|
||||||
sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
|
|
||||||
|
|
||||||
mac {
|
|
||||||
sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse
|
|
||||||
sse3dnow_compiler.commands += -Xarch_x86_64 -m3dnow -Xarch_x86_64 -msse
|
|
||||||
} else {
|
|
||||||
sse3dnow_compiler.commands += -m3dnow -msse
|
|
||||||
}
|
|
||||||
|
|
||||||
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)}
|
|
||||||
sse3dnow_compiler.input = SSE3DNOW_SOURCES
|
|
||||||
sse3dnow_compiler.variable_out = OBJECTS
|
|
||||||
sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
|
|
||||||
silent:sse3dnow_compiler.commands = @echo compiling[sse3dnow] ${QMAKE_FILE_IN} && $$sse3dnow_compiler.commands
|
|
||||||
QMAKE_EXTRA_COMPILERS += sse3dnow_compiler
|
|
||||||
}
|
|
||||||
}
|
|
||||||
sse {
|
|
||||||
sse_compiler.commands = $$QMAKE_CXX -c -Winline
|
|
||||||
|
|
||||||
mac {
|
|
||||||
sse_compiler.commands += -Xarch_i386 -msse
|
|
||||||
sse_compiler.commands += -Xarch_x86_64 -msse
|
|
||||||
} else {
|
|
||||||
sse_compiler.commands += -msse
|
|
||||||
}
|
|
||||||
|
|
||||||
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)}
|
|
||||||
sse_compiler.input = SSE_SOURCES
|
|
||||||
sse_compiler.variable_out = OBJECTS
|
|
||||||
sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
|
|
||||||
silent:sse_compiler.commands = @echo compiling[sse] ${QMAKE_FILE_IN} && $$sse_compiler.commands
|
|
||||||
QMAKE_EXTRA_COMPILERS += sse_compiler
|
|
||||||
}
|
|
||||||
sse2 {
|
|
||||||
sse2_compiler.commands = $$QMAKE_CXX -c -Winline
|
|
||||||
|
|
||||||
mac {
|
|
||||||
sse2_compiler.commands += -Xarch_i386 -msse2
|
|
||||||
sse2_compiler.commands += -Xarch_x86_64 -msse2
|
|
||||||
} else {
|
|
||||||
sse2_compiler.commands += -msse2
|
|
||||||
}
|
|
||||||
|
|
||||||
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)}
|
|
||||||
sse2_compiler.input = SSE2_SOURCES
|
|
||||||
sse2_compiler.variable_out = OBJECTS
|
|
||||||
sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
|
|
||||||
silent:sse2_compiler.commands = @echo compiling[sse2] ${QMAKE_FILE_IN} && $$sse2_compiler.commands
|
|
||||||
QMAKE_EXTRA_COMPILERS += sse2_compiler
|
|
||||||
}
|
|
||||||
ssse3 {
|
|
||||||
ssse3_compiler.commands = $$QMAKE_CXX -c -Winline
|
|
||||||
|
|
||||||
mac {
|
|
||||||
ssse3_compiler.commands += -Xarch_i386 -mssse3
|
|
||||||
ssse3_compiler.commands += -Xarch_x86_64 -mssse3
|
|
||||||
} else {
|
|
||||||
ssse3_compiler.commands += -mssse3
|
|
||||||
}
|
|
||||||
|
|
||||||
ssse3_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
|
||||||
ssse3_compiler.dependency_type = TYPE_C
|
|
||||||
ssse3_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
|
|
||||||
ssse3_compiler.input = SSSE3_SOURCES
|
|
||||||
ssse3_compiler.variable_out = OBJECTS
|
|
||||||
ssse3_compiler.name = compiling[ssse3] ${QMAKE_FILE_IN}
|
|
||||||
silent:ssse3_compiler.commands = @echo compiling[ssse3] ${QMAKE_FILE_IN} && $$ssse3_compiler.commands
|
|
||||||
QMAKE_EXTRA_COMPILERS += ssse3_compiler
|
|
||||||
}
|
|
||||||
iwmmxt {
|
|
||||||
iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
|
|
||||||
iwmmxt_compiler.commands += -mcpu=iwmmxt
|
|
||||||
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)}
|
|
||||||
iwmmxt_compiler.input = IWMMXT_SOURCES
|
|
||||||
iwmmxt_compiler.variable_out = OBJECTS
|
|
||||||
iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN}
|
|
||||||
silent:iwmmxt_compiler.commands = @echo compiling[iwmmxt] ${QMAKE_FILE_IN} && $$iwmmxt_compiler.commands
|
|
||||||
QMAKE_EXTRA_COMPILERS += iwmmxt_compiler
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
mmx: SOURCES += $$MMX_SOURCES
|
|
||||||
3dnow: SOURCES += $$MMX3DNOW_SOURCES
|
|
||||||
3dnow:sse: SOURCES += $$SSE3DNOW_SOURCES
|
|
||||||
sse: SOURCES += $$SSE_SOURCES
|
|
||||||
sse2: SOURCES += $$SSE2_SOURCES
|
|
||||||
ssse3: SOURCES += $$SSSE3_SOURCES
|
|
||||||
iwmmxt: SOURCES += $$IWMMXT_SOURCES
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user