diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-11-08 17:47:08 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-11-08 18:31:29 +0000 |
| commit | dc867bbf3aebb04891a751d7195fd9b714708d1e (patch) | |
| tree | a1aa6e2eec49bbc3aea51d0ce10fde00bcb03459 | |
| parent | 71d66f3678e542cf5c40d0f09ddcf62cd8d7a19b (diff) | |
Makefile.vc6: Added support for WinIDN
| -rw-r--r-- | lib/Makefile.vc6 | 4 | ||||
| -rw-r--r-- | src/Makefile.vc6 | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 0edde28cf..adf4a4cf2 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -130,6 +130,10 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include CFLAGS = $(CFLAGS) /DUSE_IPV6
!ENDIF
+!IFDEF USE_IDN
+CFLAGS = $(CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES
+!ENDIF
+
##############################################################
# Runtime library configuration
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index fc9464d84..fb7fdd90f 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -90,19 +90,24 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK" ########################################################
## Nothing more to do below this line!
-ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
-ZLIB_LFLAGS = "/LIBPATH:$(ZLIB_PATH)"
-ZLIB_LIBS = zlib.lib
-ZLIB_IMP_LIBS = zdll.lib
+ZLIB_CFLAGS = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
+ZLIB_LFLAGS = "/LIBPATH:$(ZLIB_PATH)"
+ZLIB_LIBS = zlib.lib
+ZLIB_IMP_LIBS = zdll.lib
SSL_CFLAGS = /DUSE_SSLEAY
SSL_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32"
SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"
SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib
+WINLIBS = ws2_32.lib wldap32.lib advapi32.lib
WINSSL_CFLAGS = /DUSE_SCHANNEL
#WINSSL_LIBS = gdi32.lib user32.lib
+!IFDEF USE_IDN
+WINLIBS = $(WINLIBS) normaliz.lib
+!ENDIF
+
# Runtime library configuration
RTLIB = /MD
RTLIBD = /MDd
@@ -340,9 +345,8 @@ LINKLIBS_DEBUG = $(LIBCURL_IMP_LIB_DBG) $(SSL_LIBS) $(ZLIB_IMP_LIBS) LFLAGS = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)
!ENDIF
-
-LINKLIBS = $(LINKLIBS) ws2_32.lib wldap32.lib advapi32.lib
-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) ws2_32.lib wldap32.lib advapi32.lib
+LINKLIBS = $(LINKLIBS) $(WINLIBS)
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(WINLIBS)
all : release
|