makefile: Added support for VC11

diff --git a/Makefile.dist b/Makefile.dist
index c8152fb55f0c9b4f68848232b0fbd41c40e2302f..e0b3232f2bb4e66e555fb1000e458bf979de05dd 100644 (file)
--- 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 5eac3820d001f2b5c92ca43b0830a2c612b5d8e9..4e0511375cc01032237bd12f80a2fc5a2826306a 100644 (file)
--- 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>\r
 \r
 where <options> is one or many of:\r
-  VC=<6,7,8,9,10>              - VC versions\r
+  VC=<6,7,8,9,10,11>           - 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://pecl2.php.net/downloads/php-windows-builds/\r

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index bc4283266ef3e2d2cbfd4bf64dfcf02a0188d1c7..2829a8b4c8156100eecae0ae8c3970c39b8b0439 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>              - VC versions\r
+!MESSAGE   VC=<6,7,8,9,10,11>           - 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 aca4ac9cad31b9a216bef4120c506bbd868096f0..e43dd367bba3908391b2df658a8efdc3a7ad6909 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 and 10\r
+# Makefile for building libcurl with MSVC 6, 7, 8, 9, 10 and 11\r
 #\r
 # Usage: see usage message below\r
 #        Should be invoked from winbuild directory\r