summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-icc/qmake.conf
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/win32-icc/qmake.conf')
-rw-r--r--mkspecs/win32-icc/qmake.conf17
1 files changed, 13 insertions, 4 deletions
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index a20d7c3122..d326cdeee3 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -21,10 +21,16 @@ 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_LTCG = -Qipo
+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,8 +43,10 @@ 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
+QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG
QMAKE_INCDIR =
@@ -56,6 +64,7 @@ QMAKE_LFLAGS_DEBUG = /DEBUG
QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:console
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:windows
QMAKE_LFLAGS_DLL = /DLL
+QMAKE_LFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG
QMAKE_EXTENSION_STATICLIB = lib
QMAKE_LIBS =