diff options
author | Anatol Belski <ab@php.net> | 2018-01-14 16:42:17 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2018-01-14 16:42:17 +0100 |
commit | be0620a2f03663f7917891eea9c1dfcf530dd9db (patch) | |
tree | 6f0d4d1553759db8f15047a4b1b084ce51c9dff5 | |
parent | 43c578b4b27d954c27a5a1b44f81e8033e3a0138 (diff) | |
parent | 089a3213ae9f0b61b19a4dc77897fa07da5298f3 (diff) | |
download | php-git-be0620a2f03663f7917891eea9c1dfcf530dd9db.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync for upcoming vc++ 15.6 version raise
-rw-r--r-- | win32/build/confutils.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 59991797bc..1c463877cb 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -72,6 +72,7 @@ VC_VERSIONS[1900] = 'MSVC14 (Visual C++ 2015)'; VC_VERSIONS[1910] = 'MSVC15 (Visual C++ 2017)'; VC_VERSIONS[1911] = 'MSVC15 (Visual C++ 2017)'; VC_VERSIONS[1912] = 'MSVC15 (Visual C++ 2017)'; +VC_VERSIONS[1913] = 'MSVC15 (Visual C++ 2017)'; var VC_VERSIONS_SHORT = new Array(); VC_VERSIONS_SHORT[1700] = 'VC11'; @@ -80,6 +81,7 @@ VC_VERSIONS_SHORT[1900] = 'VC14'; VC_VERSIONS_SHORT[1910] = 'VC15'; VC_VERSIONS_SHORT[1911] = 'VC15'; VC_VERSIONS_SHORT[1912] = 'VC15'; +VC_VERSIONS_SHORT[1913] = 'VC15'; if (PROGRAM_FILES == null) { PROGRAM_FILES = "C:\\Program Files"; |