diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-01-08 00:30:33 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-01-08 02:26:42 +0000 |
| commit | 01513161830d4533cf66738c2a3cd48e88468b76 (patch) | |
| tree | 8d89212a42f7d062b0fd7a76fc2fd3f790a89fd2 | |
| parent | aa1ee9e7a25a76311e3d499f269f20dfd890d9c2 (diff) | |
makefile: Added support for VC12
| -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 e0b3232f2..c80eb06d7 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -333,6 +333,17 @@ 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 +# 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 @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 4e0511375..06d7b2fb3 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,11> - VC versions
+ VC=<6,7,8,9,10,11,12> - 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 2829a8b4c..2bfc17a53 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,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 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 e43dd367b..37767a9be 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -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
# Should be invoked from winbuild directory
|