Commit ad324576 authored by Steve Holme's avatar Steve Holme
Browse files

makefile: Added support for VC14

parent 32d4260c

Makefile.dist

+12 −1
Original line number Diff line number Diff line
@@ -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

winbuild/BUILD.WINDOWS.txt

+1 −1
Original line number Diff line number Diff line
@@ -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/

winbuild/Makefile.vc

+1 −1
Original line number Diff line number Diff line
@@ -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/

winbuild/MakefileBuild.vc

+1 −1
Original line number Diff line number Diff line
@@ -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