diff options
Diffstat (limited to 'tools/configure')
-rw-r--r-- | tools/configure/configureapp.cpp | 3 | ||||
-rw-r--r-- | tools/configure/environment.cpp | 5 | ||||
-rw-r--r-- | tools/configure/environment.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index bd7d54a..964d0e3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1374,7 +1374,8 @@ void Configure::parseCmdLine() qmakeSpec.endsWith("-msvc2005") || qmakeSpec.endsWith("-msvc2008") || qmakeSpec.endsWith("-msvc2010") || - qmakeSpec.endsWith("-msvc2012")) { + qmakeSpec.endsWith("-msvc2012") || + qmakeSpec.endsWith("-msvc2013")) { if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; } else if (qmakeSpec.contains("win32-g++")) { diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 34aa78c..7331e03 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -82,6 +82,8 @@ struct CompilerInfo{ {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_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}, }; @@ -107,6 +109,9 @@ QString Environment::detectQMakeSpec() { QString spec; switch (detectCompiler()) { + case CC_NET2013: + spec = "win32-msvc2013"; + break; case CC_NET2012: spec = "win32-msvc2012"; break; diff --git a/tools/configure/environment.h b/tools/configure/environment.h index eabd00a..1b99ce3 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -55,7 +55,8 @@ enum Compiler { CC_NET2005 = 0x80, CC_NET2008 = 0x90, CC_NET2010 = 0xA0, - CC_NET2012 = 0xB0 + CC_NET2012 = 0xB0, + CC_NET2013 = 0xC0 }; struct CompilerInfo; |