diff options
| -rw-r--r-- | mkspecs/features/simd.prf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-icc/qmake.conf | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf index 62a63f90ca..fc336f9326 100644 --- a/mkspecs/features/simd.prf +++ b/mkspecs/features/simd.prf @@ -198,7 +198,7 @@ gcc { # includes intel_icc and clang variants QMAKE_EXTRA_COMPILERS += mips_dspr2_compiler QMAKE_EXTRA_COMPILERS += mips_dspr2_assembler } -} else:win32-msvc*|winrt { +} else:msvc { sse2 { HEADERS += $$SSE2_HEADERS diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 2985b9ee82..a60d846e2f 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -21,10 +21,15 @@ QMAKE_CFLAGS = -nologo -Zm200 /Qprec /Qwd1744,1738 QMAKE_CFLAGS_WARN_ON = -W3 /Qwd673 QMAKE_CFLAGS_WARN_OFF = -W0 /Qwd673 QMAKE_CFLAGS_RELEASE = -O2 -MD -# Giving -O2 to debug builds should make icc 9.1 happy, but it might make debugging harder, so it might be reverted. -# This is actually a workaround for a bug in icc 9.1. -QMAKE_CFLAGS_DEBUG = -Zi -MDd -O2 +QMAKE_CFLAGS_DEBUG = -Zi -MDd -Od QMAKE_CFLAGS_YACC = +QMAKE_CFLAGS_SSE2 = -QxSSE2 +QMAKE_CFLAGS_SSE3 = -QxSSE3 +QMAKE_CFLAGS_SSSE3 = -QxSSSE3 +QMAKE_CFLAGS_SSE4_1 = -QxSSE4.1 +QMAKE_CFLAGS_SSE4_2 = -QxSSE4.2 +QMAKE_CFLAGS_AVX = -QxAVX +QMAKE_CFLAGS_AVX2 = -QxCORE-AVX2 QMAKE_CXX = $$QMAKE_CC QMAKE_CXXFLAGS = $$QMAKE_CFLAGS /Zc:forScope @@ -37,7 +42,7 @@ QMAKE_CXXFLAGS_STL_ON = -GX QMAKE_CXXFLAGS_STL_OFF = QMAKE_CXXFLAGS_RTTI_ON = -GR QMAKE_CXXFLAGS_RTTI_OFF = -QMAKE_CXXFLAGS_EXCEPTIONS_ON = -GX +QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_CXXFLAGS_CXX11 = -Qstd=c++11 |