diff options
| author | Alexey Ivanov <alexey.ivanes@gmail.com> | 2012-09-29 23:47:49 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-31 23:54:56 (GMT) |
| commit | 7c60bee5678aaf5ca2141de65d173a4704bb259e (patch) | |
| tree | 00e44018106684465c7a70f26345e7765b9de9d4 | |
| parent | 015e84b8d92ea24008341bbc71b346412d52ea48 (diff) | |
| download | Qt-7c60bee5678aaf5ca2141de65d173a4704bb259e.zip Qt-7c60bee5678aaf5ca2141de65d173a4704bb259e.tar.gz Qt-7c60bee5678aaf5ca2141de65d173a4704bb259e.tar.bz2 | |
Updated and fixed win32-icc mkspec for ICC 12.1 or better
Change-Id: I50653386b0abcb39bc50ea90b65201922460ee75
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | mkspecs/win32-icc/qmake.conf | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 2dd796d..002a165 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -1,7 +1,7 @@ # # qmake configuration for win32-icc # -# Written for Intel C++ +# Written for Intel C++ Compiler 12.1 and better # MAKEFILE_GENERATOR = MSVC.NET @@ -16,27 +16,29 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -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 = /nologo /Zm200 /Qprec /Zc:wchar_t- +QMAKE_CFLAGS_WARN_ON = /W3 +QMAKE_CFLAGS_WARN_OFF = /W0 +QMAKE_CFLAGS_RELEASE = /O2 /MD /GF /GS- +QMAKE_CFLAGS_DEBUG = /Zi /Od /MDd /GS QMAKE_CFLAGS_YACC = +QMAKE_CFLAGS_LTCG = /Qipo +QMAKE_CFLAGS_MP = /MP QMAKE_CXX = $$QMAKE_CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS /Zc:forScope +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_STL_ON = -GX +QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG +QMAKE_CXXFLAGS_MP = $$QMAKE_CFLAGS_MP +QMAKE_CXXFLAGS_STL_ON = /EHsc QMAKE_CXXFLAGS_STL_OFF = -QMAKE_CXXFLAGS_RTTI_ON = -GR -QMAKE_CXXFLAGS_RTTI_OFF = -QMAKE_CXXFLAGS_EXCEPTIONS_ON = -GX +QMAKE_CXXFLAGS_RTTI_ON = /GR +QMAKE_CXXFLAGS_RTTI_OFF = /GR- +QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHsc QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_INCDIR = @@ -51,13 +53,13 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = xilink -QMAKE_LFLAGS = /NOLOGO -QMAKE_LFLAGS_RELEASE = +QMAKE_LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT +QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:console QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:windows QMAKE_LFLAGS_DLL = /DLL -QMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000 +QMAKE_LFLAGS_LTCG = /LTCG QMAKE_LIBS = QMAKE_LIBS_CORE = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib |