makefile: Added support for VC14

diff --git a/Makefile.dist b/Makefile.dist
index f0f50d8cfe58f7a11d5c4dd4f74a8aef507c51b6..393a09d47da751a96b7c93c8e4970010586c304b 100644 (file)
--- 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 ed19e56c0a4ec644c7bbcdf5dc5f48fd720178ff..1556fe654b5e0a012ae8fd30deb5a013cef3299d 100644 (file)
--- 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>\r
 \r
 where <options> is one or many of:\r
-  VC=<6,7,8,9,10,11,12>        - VC versions\r
+  VC=<6,7,8,9,10,11,12,14>     - VC versions\r
   WITH_DEVEL=<path>            - Paths for the development files (SSL, zlib, etc.)\r
                                  Defaults to sibbling directory deps: ../deps\r
                                  Libraries can be fetched at http://windows.php.net/downloads/php-sdk/deps/\r

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 21e1614aecb8c9f6880a197f3ecc862edc15752a..5b726cd57da8e2642189efed0a1f86c09cd799c3 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -15,7 +15,7 @@ CFGSET=true
 \r
 !MESSAGE Usage: nmake /f Makefile.vc mode=<static or dll> <options>\r
 !MESSAGE where <options> is one or many of:\r
-!MESSAGE   VC=<6,7,8,9,10,11,12>        - VC versions\r
+!MESSAGE   VC=<6,7,8,9,10,11,12,14>     - VC versions\r
 !MESSAGE   WITH_DEVEL=<path>            - Paths for the development files (SSL, zlib, etc.)\r
 !MESSAGE                                  Defaults to sibbling directory deps: ../deps\r
 !MESSAGE                                  Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/\r

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 2cad15c9c489c4a319cdad62dbbd6821b9c902fd..28d40baa0c9d6907cdc31a9e26febd98e1d2c447 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -22,7 +22,7 @@
 \r
 ###########################################################################\r
 #\r
-# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10, 11 and 12\r
+# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10, 11, 12 and 14\r
 #\r
 # Usage: see usage message below\r
 #        Should be invoked from winbuild directory\r