winbuild: Fixed environment variables being lost

Fixed USE_IPV6 and USE_IDN not being passed
from Makefile.vc to MakefileBuild.vc
Fixed whitespace and formatting issues
Fixed typo and format in help message

2 files changed, 60 insertions, 40 deletions

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 8fafecf98..a45e4ee56 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -23,12 +23,12 @@ CFGSET=true
 !MESSAGE   WITH_SSL=<dll or static>     - Enable OpenSSL support, DLL or static

 !MESSAGE   WITH_ZLIB=<dll or static>    - Enable ZLib support, DLL or static

 !MESSAGE   WITH_SSH2=<dll or static>    - Enable LIbSSH2 support, DLL or static

-!MESSAGE   USE_SSSPI=<yes or no>        - Enable SSPI support, default to yes

-!MESSAGE   ENABLE_IPV6=<yes or no>         - Enable IPV6, default to yes

-!MESSAGE   DEBUG=<yes or no>            - Debug builds

+!MESSAGE   USE_SSPI=<yes or no>         - Enable SSPI support, default to yes

+!MESSAGE   ENABLE_IPV6=<yes or no>      - Enable IPV6, default to yes

 !MESSAGE   ENABLE_IDN=<yes or no>       - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.

 !MESSAGE                                  or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815

 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols release build)

+!MESSAGE   DEBUG=<yes or no>            - Debug builds

 !ERROR please choose a valid mode

 

 !ENDIF

@@ -40,49 +40,55 @@ top_srcdir=..
 !INCLUDE "../src/Makefile.inc"

 

 # hugehelp has a special rule

-CURL_OBJS= $(CURL_CFILES:hugehelp.c=)

+CURL_OBJS=$(CURL_CFILES:hugehelp.c=)

 

 CURL_OBJS=$(CURL_OBJS:.c=.obj)

 

 # default options

 !IFNDEF USE_SSPI

-USE_SSPI=true

+USE_SSPI = true

 !ENDIF

 

 !IFNDEF ENABLE_IPV6

-USE_IPV6   = true

+USE_IPV6 = true

 !ELSEIF "$(ENABLE_IPV6)"=="yes"

-USE_IPV6   = true

+USE_IPV6 = true

+!ELSEIF "$(ENABLE_IPV6)"=="no"

+USE_IPV6 = false

 !ENDIF

 

 !IFNDEF ENABLE_IDN

-USE_IDN=true

+USE_IDN = true

+!ELSEIF "$(ENABLE_IDN)"=="yes"

+USE_IDN = true

+!ELSEIF "$(ENABLE_IDN)"=="no"

+USE_IDN = false

 !ENDIF

 

 CONFIG_NAME_LIB = libcurl

 

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

-USE_SSL      = true

-SSL=dll

+USE_SSL = true

+SSL     = dll

 !ELSEIF "$(WITH_SSL)"=="static"

-USE_SSL      = true

-SSL=static

+USE_SSL = true

+SSL     = static

 !ENDIF

 

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

-USE_ZLIB     = true

-zlib=dll

+USE_ZLIB = true

+ZLIB     = dll

 !ELSEIF "$(WITH_ZLIB)"=="static"

-USE_ZLIB    = true

-ZLIB=static

+USE_ZLIB = true

+ZLIB     = static

 !ENDIF

 

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

-USE_SSH2    = true

-SSH2=dll

+USE_SSH2 = true

+SSH2     = dll

 !ELSEIF "$(WITH_SSH2)"=="static"

-USE_SSH2      = true

-SSH2=static

+USE_SSH2 = true

+SSH2     = static

 !ENDIF

 

 !IF "$(DEBUG)"=="yes"

@@ -133,6 +139,8 @@ $(MODE):
 	@SET MACRO_NAME=CURL_OBJS

 	@SET OUTFILE=CURL_OBJS.inc

 	@gen_resp_file.bat $(CURL_OBJS)

+	@SET USE_IPV6=$(USE_IPV6)

+	@SET USE_IDN=$(USE_IDN)

 	@$(MAKE) /NOLOGO /F MakefileBuild.vc

 

 copy_from_lib:

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index d44792279..9dfd5f62e 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -94,68 +94,80 @@ DEVEL_BIN      = $(WITH_DEVEL)/bin
 CFLAGS         = $(CFLAGS) /I"$(DEVEL_INCLUDE)"
 LFLAGS         = $(LFLAGS) "/LIBPATH:$(DEVEL_LIB)"
 
+
 !IF "$(WITH_SSL)"=="dll"
 SSL_LIBS     = libeay32.lib ssleay32.lib
 USE_SSL      = true
-SSL=dll
+SSL          = dll
 !ELSEIF "$(WITH_SSL)"=="static"
 SSL_LIBS     = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib
 USE_SSL      = true
-SSL=static
+SSL          = static
 !ENDIF
 
 !IFDEF USE_SSL
 SSL_CFLAGS   = /DUSE_SSLEAY /I"$(DEVEL_INCLUDE)/openssl"
 !ENDIF
 
+
 !IF "$(WITH_ZLIB)"=="dll"
 ZLIB_LIBS   = zlib.lib
 ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ
-USE_ZLIB     = true
-zlib=dll
+USE_ZLIB    = true
+ZLIB        = dll
 !ELSEIF "$(WITH_ZLIB)"=="static"
 ZLIB_LIBS   = zlib_a.lib
 ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ
 USE_ZLIB    = true
-ZLIB=static
+ZLIB        = static
 !ENDIF
 
 !IFDEF USE_ZLIB
 ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ
 !ENDIF
 
+
 !IF "$(WITH_SSH2)"=="dll"
 SSH2_LIBS   = libssh2.lib
 USE_SSH2    = true
-SSH2=dll
+SSH2        = dll
 !ELSEIF "$(WITH_SSH2)"=="static"
 SSH2_LIBS   = libssh2_a_debug.lib
 USE_SSH2    = true
-SSH2=static
+SSH2        = static
 !ENDIF
 
 !IFDEF USE_SSH2
-SSH2_CFLAGS   = /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /DUSE_LIBSSH2
-SSH2_CFLAGS   = $(SSH2_CFLAGS) /I$(WITH_DEVEL)/include/libssh2
+SSH2_CFLAGS = /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /DUSE_LIBSSH2
+SSH2_CFLAGS = $(SSH2_CFLAGS) /I$(WITH_DEVEL)/include/libssh2
 !ENDIF
 
+
 !IFNDEF USE_SSPI
-USE_SSPI=yes
+USE_SSPI = yes
 !ENDIF
 
 !IF "$(USE_SSPI)"=="yes"
 CFLAGS_SSPI = /DUSE_WINDOWS_SSPI
-USE_SSPI=true
+USE_SSPI    = true
 !ENDIF
 
+
 !IFNDEF USE_IPV6
-USE_IPV6=true
+USE_IPV6  = true
+!ELSEIF "$(USE_IPV6)"=="yes"
+USE_IPV6  = true
 !ENDIF
 
+!IF "$(USE_IPV6)"=="true"
+CFLAGS    = $(CFLAGS) /DUSE_IPV6
+!ENDIF
+
+
 !IFNDEF USE_IDN
-USE_IDN   =true
+USE_IDN   = true
 !ELSEIF "$(USE_IDN)"=="yes"
-USE_IDN   =true
+USE_IDN   = true
 !ENDIF
 
 !IF "$(USE_IDN)"=="true"
@@ -163,10 +175,7 @@ CFLAGS    = $(CFLAGS) /DUSE_WIN32_IDN
 LFLAGS    = $(LFLAGS) Normaliz.lib
 !ENDIF
 
-!IF "$(USE_IPV6)"=="true"
-CFLAGS = $(CFLAGS) /DUSE_IPV6
-USE_IPV6=true
-!ENDIF
+
 
 !IF "$(GEN_PDB)"=="yes"
 GEN_PDB=true
@@ -341,8 +350,11 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)
 	@echo Using SSH2: $(USE_SSH2)
 	@echo Using ZLIB: $(USE_ZLIB)
 	@echo Using SSPI: $(USE_SSPI)
-	@echo Using SSPI: $(LFLAGS)
-	@echo Gen PDB:    $(GEN_PDB)
+	@echo Using IPv6: $(USE_IPV6)
+	@echo Using IDN:  $(USE_IDN)
+	@echo CFLAGS:     $(CFLAGS)
+	@echo LFLAGS:     $(LFLAGS)
+	@echo GenPDB:     $(GEN_PDB)
 	@echo Debug:      $(DEBUG)
 	$(LNK) $(LFLAGS) $(LIB_OBJS)
 	@echo Copying libs...