diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-03 10:04:35 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-03 10:49:10 (GMT) |
| commit | b86691f854adb24060cec61e4954c986fc350821 (patch) | |
| tree | 672c4c29d02455a64ccead686282200b748e9153 | |
| parent | 0c6f61ccdf24259d9dc64ae0d0bcd004a957cd46 (diff) | |
| download | Qt-b86691f854adb24060cec61e4954c986fc350821.zip Qt-b86691f854adb24060cec61e4954c986fc350821.tar.gz Qt-b86691f854adb24060cec61e4954c986fc350821.tar.bz2 | |
Move the SIMD defines to the common declaration of Qt symbols
Move the #defines for the SIMD extension to the common code
in order to be able to use them from any module without copying their
definition.
Reviewed-by: Andreas Kling
| -rw-r--r-- | mkspecs/features/qt.prf | 13 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 37 | ||||
| -rw-r--r-- | src/gui/gui.pro | 11 |
3 files changed, 15 insertions, 46 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index e8946de..aa0f06e 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -209,3 +209,16 @@ wince*:static:gui { mac { !isEmpty(QT_NAMESPACE_MAC_CRC):DEFINES *= QT_NAMESPACE_MAC_CRC=$$QT_NAMESPACE_MAC_CRC } + +#SIMD defines: +neon: DEFINES += QT_HAVE_NEON +mmx:DEFINES += QT_HAVE_MMX +3dnow:DEFINES += QT_HAVE_3DNOW +sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT +sse2:DEFINES += QT_HAVE_SSE2 +sse3:DEFINES += QT_HAVE_SSE3 +ssse3:DEFINES += QT_HAVE_SSSE3 +sse4_1:DEFINES += QT_HAVE_SSE4_1 +sse4_2:DEFINES += QT_HAVE_SSE4_2 +avx:DEFINES += QT_HAVE_AVX +iwmmxt:DEFINES += QT_HAVE_IWMMXT diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index bbf445f..bc8ef9f 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -53,39 +53,6 @@ symbian: { DEPLOYMENT = partial_upgrade $$DEPLOYMENT } -mmx { - DEFINES += QT_HAVE_MMX -} -3dnow { - DEFINES += QT_HAVE_3DNOW -} -sse { - DEFINES += QT_HAVE_SSE - DEFINES += QT_HAVE_MMXEXT -} -sse2 { - DEFINES += QT_HAVE_SSE2 -} -sse3 { - DEFINES += QT_HAVE_SSE3 -} -ssse3 { - DEFINES += QT_HAVE_SSSE3 -} -sse4_1 { - DEFINES += QT_HAVE_SSE4_1 -} -sse4_2 { - DEFINES += QT_HAVE_SSE4_2 -} -avx { - DEFINES += QT_HAVE_AVX -} -iwmmxt { - DEFINES += QT_HAVE_IWMMXT -} -neon { - DEFINES += QT_HAVE_NEON - QMAKE_CXXFLAGS *= -mfpu=neon -} +neon: QMAKE_CXXFLAGS *= -mfpu=neon + diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 1b43ef2..28440cc 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -80,17 +80,6 @@ symbian { contains(QMAKE_MAC_XARCH, no) { DEFINES += QT_NO_MAC_XARCH } else { - mmx:DEFINES += QT_HAVE_MMX - 3dnow:DEFINES += QT_HAVE_3DNOW - sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT - sse2:DEFINES += QT_HAVE_SSE2 - sse3:DEFINES += QT_HAVE_SSE3 - ssse3:DEFINES += QT_HAVE_SSSE3 - sse4_1:DEFINES += QT_HAVE_SSE4_1 - sse4_2:DEFINES += QT_HAVE_SSE4_2 - avx:DEFINES += QT_HAVE_AVX - iwmmxt:DEFINES += QT_HAVE_IWMMXT - win32-g++*|!win32:!*-icc* { mmx { mmx_compiler.commands = $$QMAKE_CXX -c -Winline |