From 1a4f58d3e67f3d271d9e24d7f52950f796542d2f Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Wed, 16 May 2012 08:50:55 +0200 Subject: Add Visual Studio 11 mkspec This adds the Visual Studio 11 mkspec and the corresponding changes to configure and qmake makesystem. Change-Id: I3a7e82a6f7f90aa0a94dedd493ebaa66bf100923 Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 3 ++- tools/configure/environment.cpp | 5 +++++ tools/configure/environment.h | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index ef41f4ae80..b9040d62f1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1115,7 +1115,8 @@ void Configure::parseCmdLine() dictionary[ "QMAKESPEC" ].endsWith("-msvc2003") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2005") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2008") || - dictionary[ "QMAKESPEC" ].endsWith("-msvc2010")) { + dictionary[ "QMAKESPEC" ].endsWith("-msvc2010") || + dictionary[ "QMAKESPEC" ].endsWith("-msvc11")) { if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; } else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) { diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index ab622b576a..43cfc06599 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -83,6 +83,8 @@ struct CompilerInfo{ {CC_NET2008, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2008 (9.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\9.0", "cl.exe"}, // link.exe, lib.exe {CC_NET2010, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2010 (10.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\10.0", "cl.exe"}, // link.exe, lib.exe {CC_NET2010, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2010 (10.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\10.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET11, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 11 (11.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET11, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 11 (11.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe {CC_UNKNOWN, "Unknown", 0, 0}, }; @@ -108,6 +110,9 @@ QString Environment::detectQMakeSpec() { QString spec; switch (detectCompiler()) { + case CC_NET11: + spec = "win32-msvc11"; + break; case CC_NET2010: spec = "win32-msvc2010"; break; diff --git a/tools/configure/environment.h b/tools/configure/environment.h index ec7cb635e1..5075e9ae5b 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -53,7 +53,8 @@ enum Compiler { CC_NET2003 = 0x71, CC_NET2005 = 0x80, CC_NET2008 = 0x90, - CC_NET2010 = 0x91 + CC_NET2010 = 0xA0, + CC_NET11 = 0xB0 }; struct CompilerInfo; -- cgit v1.2.3