summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-11-17 23:47:08 +0100
committerAnatol Belski <ab@php.net>2016-11-17 23:47:08 +0100
commitad5b79977c51961cb5cefcc6324a9775b2d9df6a (patch)
treea61250df50d423df1c9cff449c9f3f2676687cd9
parent07e395a00da85bde9086b3c6acfccafb2d5afa70 (diff)
parent8806c54b00c99d9af64f475f58967f8c7bac90e2 (diff)
downloadphp-git-ad5b79977c51961cb5cefcc6324a9775b2d9df6a.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: add vc15 to the list
-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 abc858ee5c..8b3e420b28 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -69,6 +69,7 @@ VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
VC_VERSIONS[1700] = 'MSVC11 (Visual C++ 2012)';
VC_VERSIONS[1800] = 'MSVC12 (Visual C++ 2013)';
VC_VERSIONS[1900] = 'MSVC14 (Visual C++ 2015)';
+VC_VERSIONS[1910] = 'MSVC15 (Visual C++ 2017)';
var VC_VERSIONS_SHORT = new Array();
VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -80,6 +81,7 @@ VC_VERSIONS_SHORT[1600] = 'VC10';
VC_VERSIONS_SHORT[1700] = 'VC11';
VC_VERSIONS_SHORT[1800] = 'VC12';
VC_VERSIONS_SHORT[1900] = 'VC14';
+VC_VERSIONS_SHORT[1910] = 'VC15';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";