summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-09-14 09:24:18 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-09-17 15:00:39 (GMT)
commit370a8f0c2678e5a5a688eaa22e27d98ca8f1d82d (patch)
tree64d00133ca0699a932f71ec671d5362c90be716d /qmake
parent1df4b49a182dbff10ea7753009a33dca86ba436a (diff)
downloadQt-370a8f0c2678e5a5a688eaa22e27d98ca8f1d82d.zip
Qt-370a8f0c2678e5a5a688eaa22e27d98ca8f1d82d.tar.gz
Qt-370a8f0c2678e5a5a688eaa22e27d98ca8f1d82d.tar.bz2
Add msvc2012 support
The only essential difference to msvc2010 is the define of _ALLOW_KEYWORD_MACROS. It is a documented breaking change: http://msdn.microsoft.com/en-us/library/bb531344.aspx Updated backport of qtbase/1a4f58d3e67f3d271d9e24d7f52950f796542d2f Change-Id: Iee8b900a214a9e5f289b2139d65f2e00c8113669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.win324
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index a15d19f..ce3697b 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -1,4 +1,4 @@
-!IF "$(QMAKESPEC)" == "win32-msvc" || "$(QMAKESPEC)" == "win32-msvc.net" || "$(QMAKESPEC)" == "win32-msvc2002" || "$(QMAKESPEC)" == "win32-msvc2003" || "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-icc"
+!IF "$(QMAKESPEC)" == "win32-msvc" || "$(QMAKESPEC)" == "win32-msvc.net" || "$(QMAKESPEC)" == "win32-msvc2002" || "$(QMAKESPEC)" == "win32-msvc2003" || "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-icc"
!if "$(SOURCE_PATH)" == ""
SOURCE_PATH = ..
@@ -24,7 +24,7 @@ LINK = link
#
!if "$(QMAKESPEC)" == "win32-msvc2005"
CFLAGS_EXTRA = /Zc:wchar_t-
-!elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010"
+!elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012"
CFLAGS_EXTRA = /MP
!endif