moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

makefile: Added support for VC12

Browse Source
This commit is contained in:
Steve Holme 2014-01-08 00:30:33 +00:00
parent aa1ee9e7a2
commit 0151316183
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.dist
View File

@ -333,6 +333,17 @@ src/Makefile.vc11: src/Makefile.vc6
@echo "generate $@" @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 @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
# VC12 makefiles are for use with VS2013
vc12: lib/Makefile.vc12 src/Makefile.vc12
lib/Makefile.vc12: 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/vc12/g" -e "s/VC6/VC12/g" lib/Makefile.vc6 > lib/Makefile.vc12
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
ca-bundle: lib/mk-ca-bundle.pl ca-bundle: lib/mk-ca-bundle.pl
@echo "generate a fresh ca-bundle.crt" @echo "generate a fresh ca-bundle.crt"
@perl $< -b -l -u lib/ca-bundle.crt @perl $< -b -l -u lib/ca-bundle.crt

2
winbuild/BUILD.WINDOWS.txt
View File

@ -52,7 +52,7 @@ a directory named using the options given to the nmake call.
nmake /f Makefile.vc mode=<static or dll> <options> nmake /f Makefile.vc mode=<static or dll> <options>
where <options> is one or many of: where <options> is one or many of:
VC=<6,7,8,9,10,11> - VC versions VC=<6,7,8,9,10,11,12> - VC versions
WITH_DEVEL=<path> - Paths for the development files (SSL, zlib, etc.) WITH_DEVEL=<path> - Paths for the development files (SSL, zlib, etc.)
Defaults to sibbling directory deps: ../deps Defaults to sibbling directory deps: ../deps
Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/ Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/

2
winbuild/Makefile.vc
View File

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

2
winbuild/MakefileBuild.vc
View File

@ -22,7 +22,7 @@
########################################################################### ###########################################################################
# #
# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10 and 11 # Makefile for building libcurl with MSVC 6, 7, 8, 9, 10, 11 and 12
# #
# Usage: see usage message below # Usage: see usage message below
# Should be invoked from winbuild directory # Should be invoked from winbuild directory