diff options
| author | Pierre Joye <pajoye@php.net> | 2009-11-30 09:52:33 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2009-11-30 09:52:33 +0000 |
| commit | 8109abba8b4b037b192af4e8f2f0498d1d1b2926 (patch) | |
| tree | 5e16ba65b170945a3023ac47ed89eafff739b072 /win32 | |
| parent | 16450418b188a0a20b552614d9261c768a75d79f (diff) | |
| download | php-git-8109abba8b4b037b192af4e8f2f0498d1d1b2926.tar.gz | |
- MFH: vs2010 detection support, restore /W3
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32 | 1 | ||||
| -rw-r--r-- | win32/build/confutils.js | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 7d8cde446a..8861d49b78 100644 --- 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 28b5e0d868..ed3f2424f9 100644 --- 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)';
VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
+VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
var VC_VERSIONS_SHORT = new Array();
VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -48,6 +49,7 @@ VC_VERSIONS_SHORT[1300] = 'VC7'; VC_VERSIONS_SHORT[1310] = 'VC7.1';
VC_VERSIONS_SHORT[1400] = 'VC8';
VC_VERSIONS_SHORT[1500] = 'VC9';
+VC_VERSIONS_SHORT[1600] = 'VC10';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";
|