pajoye Mon, 30 Nov 2009 09:52:33 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291481
Log:
- MFH: vs2010 detection support, restore /W3
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/branches/PHP_5_3/win32/build/confutils.js
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-11-30 09:22:41 UTC
(rev 291480)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-11-30 09:52:33 UTC
(rev 291481)
@@ -15,6 +15,7 @@
// 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]);
Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js 2009-11-30
09:22:41 UTC (rev 291480)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js 2009-11-30
09:52:33 UTC (rev 291481)
@@ -41,6 +41,7 @@
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[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";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
