From 7cd45b297ec2d09af92cd6defccd54c7e9ac5a3d Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sat, 11 Jan 2014 14:33:33 +0000 Subject: [PATCH] Makefile.dist: Added support for VC7 Currently VC7 and VC7.1 builds have to be ran with the VC variable set to vc6 which is not only inconsistent with the nmake winbuild system but also with newer versions of Visual Studio supported by this file. Note: This doesn't break the build for anyone still running with the VC variable set to vc6 or not set (which defaults to vc6). --- Makefile.dist | 12 ++++++++++++ RELEASE-NOTES | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.dist b/Makefile.dist index c80eb06d7..343b40c11 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -290,6 +290,18 @@ linux-ssl: ssl # We don't need to do anything for vc6. vc6: +# VC7 makefiles are for use with VS.NET and VS.NET 2003 +vc7: lib/Makefile.vc7 src/Makefile.vc7 + +lib/Makefile.vc7: lib/Makefile.vc6 + @echo "generate $@" + @sed -e "s/VC6/VC7/g" lib/Makefile.vc6 > lib/Makefile.vc7 + +src/Makefile.vc7: src/Makefile.vc6 + @echo "generate $@" + @sed -e "s/VC6/VC7/g" src/Makefile.vc6 > src/Makefile.vc7 + +# VC8 makefiles are for use with VS2005 vc8: lib/Makefile.vc8 src/Makefile.vc8 lib/Makefile.vc8: lib/Makefile.vc6 diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 17bbbea7e..f919dc795 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -13,7 +13,7 @@ This release includes the following changes: o imap/pop3/smtp: Extended the login options to support multiple auth mechanisms o TheArtOfHttpScripting: major update, converted layout and more o mprintf: Added support for I, I32 and I64 size specifiers - o makefile: Added support for VC11 and VC12 + o makefile: Added support for VC7, VC11 and VC12 o This release includes the following bugfixes: