diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2015-07-21 18:52:43 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2015-07-21 18:52:43 +0100 |
| commit | ad324576230159dcf03fb9f5ac0b4d9c2b7b457a (patch) | |
| tree | f0c74f7f80627324354351c651c14e72d7b9d853 | |
| parent | 32d4260c2d93503f035ee97e7eb92faf5c2ec6ae (diff) | |
| download | curl-ad324576230159dcf03fb9f5ac0b4d9c2b7b457a.tar.gz | |
makefile: Added support for VC14
| -rw-r--r-- | Makefile.dist | 13 | ||||
| -rw-r--r-- | winbuild/BUILD.WINDOWS.txt | 2 | ||||
| -rw-r--r-- | winbuild/Makefile.vc | 2 | ||||
| -rw-r--r-- | winbuild/MakefileBuild.vc | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.dist b/Makefile.dist index f0f50d8cf..393a09d47 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2015, 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 @@ -566,6 +566,17 @@ src/Makefile.vc12: src/Makefile.vc6 @echo "generate $@" @sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc12/g" -e "s/VC6/VC12/g" src/Makefile.vc6 > src/Makefile.vc12 +# VC14 makefiles are for use with VS2015 +vc14: lib/Makefile.vc14 src/Makefile.vc14 + +lib/Makefile.vc14: lib/Makefile.vc6 + @echo "generate $@" + @sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc14/g" -e "s/VC6/VC14/g" lib/Makefile.vc6 > lib/Makefile.vc14 + +src/Makefile.vc14: src/Makefile.vc6 + @echo "generate $@" + @sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc14/g" -e "s/VC6/VC14/g" src/Makefile.vc6 > src/Makefile.vc14 + ca-bundle: lib/mk-ca-bundle.pl @echo "generate a fresh ca-bundle.crt" @perl $< -b -l -u lib/ca-bundle.crt 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
|