aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSapien2 <malov.anton@gmail.com>2012-10-25 14:54:07 +0400
committerMarc Hoersken <info@marc-hoersken.de>2012-11-01 22:06:54 +0100
commit3be96564a8cf5ca40275cc95c8bb4df5dd3fe8a9 (patch)
tree3076a5fda26bc4012b0c8ba59a8a8281f16acef4
parent0cb5650386990a6330375a21bad3dee17c162693 (diff)
Even more winbuild refactoring
-rw-r--r--winbuild/MakefileBuild.vc12
1 files changed, 8 insertions, 4 deletions
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 9cbd35f98..e573e9145 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -66,6 +66,7 @@ LFLAGS_PDB = /incremental:no /opt:ref,icf
CFLAGS_LIBCURL_STATIC = /DCURL_STATICLIB
+WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib
LIB_NAME_STATIC = libcurl_a.lib
LIB_NAME_STATIC_DEBUG = libcurl_a_debug.lib
LIB_NAME_DLL = libcurl.dll
@@ -148,8 +149,8 @@ USE_IDN = true
!ENDIF
!IF "$(USE_IDN)"=="true"
-CFLAGS = $(CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES
-LFLAGS = $(LFLAGS) Normaliz.lib
+IDN_CFLAGS = $(IDN_CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES
+WIN_LIBS = $(WIN_LIBS) Normaliz.lib
!ENDIF
@@ -196,6 +197,7 @@ USE_WINSSL = $(USE_SSPI)
USE_WINSSL = true
!ENDIF
+
!IF "$(USE_WINSSL)"=="true"
!IF "$(USE_SSPI)"!="true"
!ERROR cannot build with WinSSL without SSPI
@@ -204,7 +206,6 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
!ENDIF
-
!IF "$(GEN_PDB)"=="yes"
GEN_PDB = true
!ENDIF
@@ -235,7 +236,6 @@ AS_DLL = true
CFGSET = true
!ENDIF
-WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib
!IF "$(CFGSET)" == "FALSE"
!ERROR please choose a valid mode
!ENDIF
@@ -303,6 +303,10 @@ CFLAGS = $(CFLAGS) $(SSH2_CFLAGS)
LFLAGS = $(LFLAGS) $(SSH2_LFLAGS) $(SSH2_LIBS)
!ENDIF
+!IF "$(USE_IDN)"=="true"
+CFLAGS = $(CFLAGS) $(IDN_CFLAGS)
+!ENDIF
+
!IF "$(USE_IPV6)"=="true"
CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)
!ENDIF