Commit:    dabe89c6f36a03117e1614546dd90de80b9e90d4
Author:    unknown <paj...@php.net>         Sat, 8 Sep 2012 18:46:33 +0200
Parents:   60ad16e11f97fb58f736577c2cf9fef9f109b97a
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=dabe89c6f36a03117e1614546dd90de80b9e90d4

Log:
-enable VC11 (vc2012)

Changed paths:
  M  win32/build/config.w32
  M  win32/build/confutils.js


Diff:
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 92347e7..cca7054 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -163,8 +163,13 @@ if (VCVERS >= 1500 && PHP_MP != 'disable') {
 }
 
 // General link flags
-DEFINE("LDFLAGS", "/nologo /version:" +
-       PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION);
+
+if (VCVERS >= 1700) {
+       DEFINE("LDFLAGS", "/nologo ");
+} else {
+       DEFINE("LDFLAGS", "/nologo /version:" +
+                       PHP_VERSION + "." + PHP_MINOR_VERSION + "." + 
PHP_RELEASE_VERSION);
+}
 
 // General DLL link flags
 DEFINE("DLL_LDFLAGS", "/dll ");
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index d1f7eca..1362e63 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -46,6 +46,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)';
+VC_VERSIONS[1700] = 'MSVC11 (Visual C++ 2012)';
 
 var VC_VERSIONS_SHORT = new Array();
 VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -54,6 +55,7 @@ VC_VERSIONS_SHORT[1310] = 'VC7.1';
 VC_VERSIONS_SHORT[1400] = 'VC8';
 VC_VERSIONS_SHORT[1500] = 'VC9';
 VC_VERSIONS_SHORT[1600] = 'VC10';
+VC_VERSIONS_SHORT[1700] = 'VC11';
 
 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

Reply via email to