diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-08-31 18:12:30 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-09-02 10:56:33 (GMT) |
| commit | ac33c5ba3206ac7bb1d38c796139d864a637f7a4 (patch) | |
| tree | 9ce506487ab4cce6b31dfb2904b54b061fab3289 /mkspecs/win32-msvc2010 | |
| parent | a1e1103e1c3f0e47c5d075660a77d00f47e1c125 (diff) | |
| download | Qt-ac33c5ba3206ac7bb1d38c796139d864a637f7a4.zip Qt-ac33c5ba3206ac7bb1d38c796139d864a637f7a4.tar.gz Qt-ac33c5ba3206ac7bb1d38c796139d864a637f7a4.tar.bz2 | |
Add option to enable -MP compile option for MSVC
The option is on when building Qt, but off by default for other
projects, due to potential incompatible compile options in other
projects. (/E, /EP, /Gm, /Yc, /showIncludes, #import preprocessor
directive)
Reviewed-by: bhughes
Reviewed-by: ossi
Diffstat (limited to 'mkspecs/win32-msvc2010')
| -rw-r--r-- | mkspecs/win32-msvc2010/qmake.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index 28d4d3c..8331c14 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/qmake.conf @@ -23,6 +23,7 @@ QMAKE_CFLAGS_RELEASE = -O2 -MD QMAKE_CFLAGS_DEBUG = -Zi -MDd QMAKE_CFLAGS_YACC = QMAKE_CFLAGS_LTCG = -GL +QMAKE_CFLAGS_MP = -MP QMAKE_CXX = $$QMAKE_CC QMAKE_CXXFLAGS = $$QMAKE_CFLAGS @@ -32,6 +33,7 @@ QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC 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 |