diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-01-08 00:15:30 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-01-08 01:36:33 +0000 |
| commit | aa1ee9e7a25a76311e3d499f269f20dfd890d9c2 (patch) | |
| tree | 76ea3f2658c2de8c463bda9b9e1618412e7e5dd4 | |
| parent | f61e0a34eac58c645fd6f878a0108d45b2f7f6da (diff) | |
makefile: Added support for VC11
| -rw-r--r-- | Makefile.dist | 11 | ||||
| -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, 14 insertions, 3 deletions
diff --git a/Makefile.dist b/Makefile.dist index c8152fb55..e0b3232f2 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -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 diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt index 5eac3820d..4e0511375 100644 --- a/winbuild/BUILD.WINDOWS.txt +++ b/winbuild/BUILD.WINDOWS.txt @@ -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/
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index bc4283266..2829a8b4c 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> - 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/
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index aca4ac9ca..e43dd367b 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -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
|