summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-01-20 10:05:37 +0100
committerAnatol Belski <ab@php.net>2014-01-20 10:05:37 +0100
commitd501707248544c585ecd351d7512cde5982790c4 (patch)
treec28c112da9d35f3ecb06306f14d12b8c9e0f9a82
parent5b5b9b9239cf470b071bdfc383df8a771483fc09 (diff)
parent379f4c0ceb9f84e7e11f2befd48e675200cf7e0d (diff)
downloadphp-git-d501707248544c585ecd351d7512cde5982790c4.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: support for Visual C+ 2013
-rw-r--r--win32/build/confutils.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index d9a0c1b5f1..e0df4f621b 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -47,6 +47,7 @@ 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)';
+VC_VERSIONS[1800] = 'MSVC12 (Visual C++ 2013)';
var VC_VERSIONS_SHORT = new Array();
VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -56,6 +57,7 @@ VC_VERSIONS_SHORT[1400] = 'VC8';
VC_VERSIONS_SHORT[1500] = 'VC9';
VC_VERSIONS_SHORT[1600] = 'VC10';
VC_VERSIONS_SHORT[1700] = 'VC11';
+VC_VERSIONS_SHORT[1800] = 'VC12';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";