- MFH: vs2010 detection support, restore /W3

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 7d8cde446adae59499ada12e3e3a648c37313528..8861d49b787e59feec61dff07e553155801ec65c 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -15,6 +15,7 @@ if (!CL) {
 // 1310 is vs.net 2003
 // 1400 is vs.net 2005
 // 1500 is vs.net 2008
+// 1600 is vs.net 2010
 // Which version of the compiler do we have?
 VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
 STDOUT.WriteLine("  Detected compiler " + VC_VERSIONS[VCVERS]);

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 28b5e0d8689b4ec803ed823d4bff7b3b0b476a90..ed3f2424f9c58b60cea3936889a9f1487007984e 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -41,6 +41,7 @@ VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)';
 VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';\r
 VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';\r
 VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';\r
+VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';\r
 \r
 var VC_VERSIONS_SHORT = new Array();\r
 VC_VERSIONS_SHORT[1200] = 'VC6';\r
@@ -48,6 +49,7 @@ VC_VERSIONS_SHORT[1300] = 'VC7';
 VC_VERSIONS_SHORT[1310] = 'VC7.1';\r
 VC_VERSIONS_SHORT[1400] = 'VC8';\r
 VC_VERSIONS_SHORT[1500] = 'VC9';\r
+VC_VERSIONS_SHORT[1600] = 'VC10';\r
 \r
 if (PROGRAM_FILES == null) {\r
        PROGRAM_FILES = "C:\\Program Files";\r