summaryrefslogtreecommitdiff
path: root/winbuild
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2015-07-21 18:52:43 +0100
committerSteve Holme <steve_holme@hotmail.com>2015-07-21 18:52:43 +0100
commitad324576230159dcf03fb9f5ac0b4d9c2b7b457a (patch)
treef0c74f7f80627324354351c651c14e72d7b9d853 /winbuild
parent32d4260c2d93503f035ee97e7eb92faf5c2ec6ae (diff)
downloadgnurl-ad324576230159dcf03fb9f5ac0b4d9c2b7b457a.tar.gz
gnurl-ad324576230159dcf03fb9f5ac0b4d9c2b7b457a.tar.bz2
gnurl-ad324576230159dcf03fb9f5ac0b4d9c2b7b457a.zip
makefile: Added support for VC14
Diffstat (limited to 'winbuild')
-rw-r--r--winbuild/BUILD.WINDOWS.txt2
-rw-r--r--winbuild/Makefile.vc2
-rw-r--r--winbuild/MakefileBuild.vc2
3 files changed, 3 insertions, 3 deletions
diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt
index ed19e56c0..1556fe654 100644
--- a/winbuild/BUILD.WINDOWS.txt
+++ b/winbuild/BUILD.WINDOWS.txt
@@ -58,7 +58,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> - VC versions
+ VC=<6,7,8,9,10,11,12,14> - 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 21e1614ae..5b726cd57 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -15,7 +15,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> - VC versions
+!MESSAGE VC=<6,7,8,9,10,11,12,14> - 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 2cad15c9c..28d40baa0 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -22,7 +22,7 @@
###########################################################################
#
-# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10, 11 and 12
+# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10, 11, 12 and 14
#
# Usage: see usage message below
# Should be invoked from winbuild directory