diff options
| author | Alessandro Ghedini <ghedo@debian.org> | 2018-01-24 10:37:13 +0000 |
|---|---|---|
| committer | Alessandro Ghedini <ghedo@debian.org> | 2018-01-24 10:37:13 +0000 |
| commit | 358ffefae02fc7eff1f0278d11848e844d689948 (patch) | |
| tree | c8da6e275ae3b3ed7f25c6f89509b642926aafb5 /winbuild | |
| parent | f8d700cf665721b5e25f494a5de0adeda259eab7 (diff) | |
New upstream version 7.58.0
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/BUILD.WINDOWS.txt | 2 | ||||
| -rw-r--r-- | winbuild/Makefile.vc | 24 | ||||
| -rw-r--r-- | winbuild/MakefileBuild.vc | 4 |
3 files changed, 26 insertions, 4 deletions
diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt index 1840991f..98deed01 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=<static or dll> <options>
where <options> 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=<path> - 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 ba73efde..cec9b14e 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -1,3 +1,25 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 1999 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at https://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +#*************************************************************************** + !IF "$(MODE)"=="static" TARGET = $(LIB_NAME_STATIC) AS_DLL = false @@ -15,7 +37,7 @@ CFGSET=true !MESSAGE Usage: nmake /f Makefile.vc mode=<static or dll> <options> !MESSAGE where <options> 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=<path> - 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 524926a0..32790ff8 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2017, Daniel Stenberg, <daniel@haxx.se>, 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
|