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

makefile: Added support for VC11

parent f61e0a34

Makefile.dist

+11 −0
Original line number Diff line number Diff line
@@ -322,6 +322,17 @@ src/Makefile.vc10: 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/vc10/g" -e "s/VC6/VC10/g" src/Makefile.vc6 > src/Makefile.vc10



# VC11 makefiles are for use with VS2012

vc11: lib/Makefile.vc11 src/Makefile.vc11



lib/Makefile.vc11: 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/vc11/g" -e "s/VC6/VC11/g" lib/Makefile.vc6 > lib/Makefile.vc11



src/Makefile.vc11: 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/vc11/g" -e "s/VC6/VC11/g" src/Makefile.vc6 > src/Makefile.vc11



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
@@ -52,7 +52,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>              - VC versions

  VC=<6,7,8,9,10,11>           - 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://pecl2.php.net/downloads/php-windows-builds/

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>              - VC versions

!MESSAGE   VC=<6,7,8,9,10,11>           - 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 and 10

# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10 and 11

#

# Usage: see usage message below

#        Should be invoked from winbuild directory