Even more winbuild refactoring

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 9cbd35f98237f8f180f8e365bfae2c17a7fed2df..e573e9145c33ca9ede8912970b99cb0bd9def12f 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -66,6 +66,7 @@ LFLAGS_PDB = /incremental:no /opt:ref,icf
 \r
 CFLAGS_LIBCURL_STATIC  = /DCURL_STATICLIB\r
 \r
+WIN_LIBS    = ws2_32.lib wldap32.lib advapi32.lib
 LIB_NAME_STATIC        = libcurl_a.lib\r
 LIB_NAME_STATIC_DEBUG  = libcurl_a_debug.lib\r
 LIB_NAME_DLL           = libcurl.dll\r
@@ -148,8 +149,8 @@ USE_IDN   = true
 !ENDIF\r
 \r
 !IF "$(USE_IDN)"=="true"\r
-CFLAGS    = $(CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES\r
-LFLAGS    = $(LFLAGS) Normaliz.lib\r
+IDN_CFLAGS = $(IDN_CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES
+WIN_LIBS   = $(WIN_LIBS) Normaliz.lib
 !ENDIF\r
 \r
 \r
@@ -196,6 +197,7 @@ USE_WINSSL  = $(USE_SSPI)
 USE_WINSSL  = true\r
 !ENDIF\r
 \r
+
 !IF "$(USE_WINSSL)"=="true"\r
 !IF "$(USE_SSPI)"!="true"\r
 !ERROR cannot build with WinSSL without SSPI\r
@@ -204,7 +206,6 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
 !ENDIF\r
 \r
 \r
-\r
 !IF "$(GEN_PDB)"=="yes"\r
 GEN_PDB = true\r
 !ENDIF\r
@@ -235,7 +236,6 @@ AS_DLL = true
 CFGSET = true\r
 !ENDIF\r
 \r
-WIN_LIBS    = ws2_32.lib wldap32.lib advapi32.lib\r
 !IF "$(CFGSET)" == "FALSE"\r
 !ERROR please choose a valid mode\r
 !ENDIF\r
@@ -303,6 +303,10 @@ CFLAGS = $(CFLAGS) $(SSH2_CFLAGS)
 LFLAGS = $(LFLAGS) $(SSH2_LFLAGS) $(SSH2_LIBS)\r
 !ENDIF\r
 \r
+!IF "$(USE_IDN)"=="true"
+CFLAGS = $(CFLAGS) $(IDN_CFLAGS)
+!ENDIF
+
 !IF "$(USE_IPV6)"=="true"\r
 CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)\r
 !ENDIF\r