diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-24 11:22:40 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-02 00:57:37 +0200 |
commit | 1f8d9d2423bcef020b1bb4c5689e9fbc7c61363b (patch) | |
tree | 1c952f4eb2d2d77e822e021799fd4c11c32c066f /mkspecs/win32-icc | |
parent | 82d906a20d3769425dec6a3c618262de9bbaee45 (diff) | |
download | qtbase-1f8d9d2423bcef020b1bb4c5689e9fbc7c61363b.tar.gz |
Update the Win32 Intel Compiler mkspec
Unlike MSVC, ICC is capable of selecting each of the processor feature
levels, so let's define the right macros.
Version 9.1 is really old and not supported, so we don't need to keep
the old workaround.
The compiler has been complaining that option -GX is deprecated and will
be removed, so update it to use the same as MSVC does.
Change-Id: I4158fcf2331c1d27462bb1cb19725c7136efab4a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs/win32-icc')
-rw-r--r-- | mkspecs/win32-icc/qmake.conf | 13 |
1 files changed, 9 insertions, 4 deletions
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 |