From 22fddb85acf07c89849ff0de95c7c92fbd265f69 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Fri, 22 Dec 2017 18:44:35 +0000 Subject: [PATCH] winbuild: Added support for VC15 --- winbuild/BUILD.WINDOWS.txt | 2 +- winbuild/Makefile.vc | 2 +- winbuild/MakefileBuild.vc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt index 1840991fe..98deed01e 100644 --- a/winbuild/BUILD.WINDOWS.txt +++ b/winbuild/BUILD.WINDOWS.txt @@ -65,7 +65,7 @@ a directory named using the options given to the nmake call. nmake /f Makefile.vc mode= where is one or many of: - VC=<6,7,8,9,10,11,12,14> - VC versions + VC=<6,7,8,9,10,11,12,14,15> - VC versions WITH_DEVEL= - Paths for the development files (SSL, zlib, etc.) Defaults to sibbling directory deps: ../deps Libraries can be fetched at http://windows.php.net/downloads/php-sdk/deps/ diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index ba73efde9..6473536f4 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -15,7 +15,7 @@ CFGSET=true !MESSAGE Usage: nmake /f Makefile.vc mode= !MESSAGE where is one or many of: -!MESSAGE VC=<6,7,8,9,10,11,12,14> - VC versions +!MESSAGE VC=<6,7,8,9,10,11,12,14,15> - VC versions !MESSAGE WITH_DEVEL= - Paths for the development files (SSL, zlib, etc.) !MESSAGE Defaults to sibbling directory deps: ../deps !MESSAGE Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/ diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 524926a02..32790ff86 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2016, Daniel Stenberg, , et al. +# Copyright (C) 1999 - 2017, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -22,7 +22,7 @@ ########################################################################### # -# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10, 11, 12 and 14 +# Makefile for building libcurl with MSVC 6 through to 15 # # Usage: see usage message below # Should be invoked from winbuild directory