diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-02 13:48:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-04 12:54:58 +0200 |
| commit | f1cdd4b2976706c6d9c3166a75afff6ec5856f3d (patch) | |
| tree | 00191db57cd88ad0a6e6cedd934256e491e697bd /tools | |
| parent | 55bf01828a36ff6b32c7164a08eebcda7fb1cc7d (diff) | |
add support for Visual Studio 2013
Add mkspec win32-msvc2013 and make VS 2013 known to configure and
qmake.
Change-Id: I6e63a4d679727a8a3f068f377956185996d72bce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 | ||||
| -rw-r--r-- | tools/configure/environment.cpp | 7 | ||||
| -rw-r--r-- | tools/configure/environment.h | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 4e70c11034..349281dd1e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1341,7 +1341,8 @@ void Configure::parseCmdLine() dictionary[ "QMAKESPEC" ].endsWith("-msvc2005") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2008") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2010") || - dictionary[ "QMAKESPEC" ].endsWith("-msvc2012")) { + dictionary[ "QMAKESPEC" ].endsWith("-msvc2012") || + dictionary[ "QMAKESPEC" ].endsWith("-msvc2013")) { 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 1b4053ccdf..d733165271 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -86,6 +86,8 @@ struct CompilerInfo{ {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_NET2012, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2012 (11.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe {CC_NET2012, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2012 (11.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET2013, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2013 (12.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\12.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET2013, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2013 (12.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\12.0", "cl.exe"}, // link.exe, lib.exe {CC_UNKNOWN, "Unknown", 0, 0}, }; @@ -111,6 +113,9 @@ QString Environment::detectQMakeSpec() { QString spec; switch (detectCompiler()) { + case CC_NET2013: + spec = "win32-msvc2013"; + break; case CC_NET2012: spec = "win32-msvc2012"; break; @@ -144,6 +149,8 @@ QString Environment::detectQMakeSpec() Compiler Environment::compilerFromQMakeSpec(const QString &qmakeSpec) { + if (qmakeSpec == QLatin1String("win32-msvc2013")) + return CC_NET2013; if (qmakeSpec == QLatin1String("win32-msvc2012")) return CC_NET2012; if (qmakeSpec == QLatin1String("win32-msvc2010")) diff --git a/tools/configure/environment.h b/tools/configure/environment.h index d1e31f6955..cef0bca29f 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -53,7 +53,8 @@ enum Compiler { CC_NET2005 = 0x80, CC_NET2008 = 0x90, CC_NET2010 = 0xA0, - CC_NET2012 = 0xB0 + CC_NET2012 = 0xB0, + CC_NET2013 = 0xC0 }; struct CompilerInfo; |