winbuild: remove docs from Makefiles and refer to README.md

Reduce risk for conflicting docs and makes it to a single place to fix
and polish.

add these missing options to the readme:

ENABLE_OPENSSL_AUTO_LOAD_CONFIG and ENABLE_UNICODE

clarify ENABLE_SCHANNEL default varies

Fixes #6216
Closes #6227
Co-Authored-by: Jay Satiro

1 files changed, 6 insertions, 21 deletions

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 2bc650064..4112b8fca 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -22,24 +22,9 @@
 

 ###########################################################################

 #

-# Makefile for building libcurl with MSVC 6 through to 15

+# Makefile for building libcurl with MSVC

 #

-# Usage: see usage message below

-#        Should be invoked from winbuild directory

-#        Edit the paths and desired library name

-#        SSL path is only required if you intend compiling

-#        with SSL.

-#

-# This make file leaves the result either a .lib or .dll file

-# in the \lib directory. It should be called from the \lib

-# directory.

-#

-# An option would have been to allow the source directory to

-# be specified, but I saw no requirement.

-#

-# Another option would have been to leave the .lib and .dll

-# files in the "cfg" directory, but then the make file

-# in \src would need to be changed.

+# Usage: see README.md

 #

 ##############################################################

 

@@ -72,7 +57,7 @@ LFLAGS     = /nologo /machine:$(MACHINE)
 LNKDLL     = link.exe /DLL

 # Use lib.exe instead of link.exe as link.exe /lib has the following bad habits:

 # - optimizing options like /opt:ref raises warnings (at least in Visual Studio 2015)

-# - all (including Windows) dependencies are aggregated (as static parts) 

+# - all (including Windows) dependencies are aggregated (as static parts)

 # - link.exe /lib is not documented (anymore) at MSDN

 # Instead of id: just create an archive, that contains all objects

 LNKLIB     = lib.exe

@@ -237,8 +222,8 @@ ZLIB_INC_DIR = $(DEVEL_INCLUDE)
 ZLIB_LIB_DIR = $(DEVEL_LIB)

 !ENDIF

 

-# Depending on how zlib is built the libraries have different names, we 

-# try to handle them all. 

+# Depending on how zlib is built the libraries have different names, we

+# try to handle them all.

 !IF "$(WITH_ZLIB)"=="dll"

 !IF EXISTS("$(ZLIB_LIB_DIR)\zlibwapi.lib")

 ZLIB_LIBS = zlibwapi.lib

@@ -622,7 +607,7 @@ CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \
  $(CURL_DIROBJ)\curl_multibyte.obj \

  $(CURL_DIROBJ)\version_win32.obj \

  $(CURL_DIROBJ)\dynbuf.obj

- 

+

 $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)

 	$(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)

 	$(MANIFESTTOOL)