diff options
| author | Alexander Shevchenko <sav_ix@ukr.net> | 2017-12-20 00:48:59 +0200 |
|---|---|---|
| committer | Alexander Shevchenko <sav_ix@ukr.net> | 2017-12-20 16:44:12 +0000 |
| commit | eef2d1af332d4d393734687dcdc80931f3a6dabc (patch) | |
| tree | 7b8a226c08ef88324541fffe6fb926d42feb5af3 /mkspecs/win32-icc | |
| parent | 33a72ee6f3ed85c3d5f694c2a3ab90b1f50786ea (diff) | |
unify windows mkspecs: reorder variables and flags
Common changes to mingw-w64, ICC on Windows, and MSVC toolchains:
- set similar order of variables and its splitting into sections,
- set similar order of flags in variables and the way they are set.
mingw-w64 toolchain:
- move 'gcc-base.conf' include before setting Windows specific
flags, similar to include 'msvc-desktop.conf' in ICC on Windows
toolchain; this leads to consistency with other toolchains
and allows to safely override common GCC variables with Windows
specific ones, when needed,
- move 'QMAKE_EXT_OBJ' and 'QMAKE_EXT_RES' variables to the linker
flags section, according to its purpose.
MSVC toolchain:
- set flags order in 'CONFIG' variable, similar to mingw-w64 toolchain.
Change-Id: I417cc8f7959c669dd504f2c5c11eb879a7989bd4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/win32-icc')
| -rw-r--r-- | mkspecs/win32-icc/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 9506097e7f..4d18b1cc55 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -17,9 +17,10 @@ QMAKE_CC = icl QMAKE_CFLAGS = -nologo -Zm200 /Qprec /Qwd1744,1738,809,3373 QMAKE_CFLAGS_WARN_ON = -W3 /Qwd673 QMAKE_CFLAGS_WARN_OFF = -W0 /Qwd673 -QMAKE_CFLAGS_DEBUG = -Zi -MDd -Od +QMAKE_CFLAGS_DEBUG = -Od -Zi -MDd QMAKE_CFLAGS_LTCG = -Qipo QMAKE_CFLAGS_DISABLE_LTCG = -Qno-ipo + QMAKE_CFLAGS_SSE2 = -QxSSE2 QMAKE_CFLAGS_SSE3 = -QxSSE3 QMAKE_CFLAGS_SSSE3 = -QxSSSE3 |