Base code merged to SPIN 2.4

[platform/upstream/curl.git] / lib / Makefile.vc6

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 2a80fc4..ee20ebe 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -65,7 +65,7 @@
 !INCLUDE ..\winbuild\Makefile.msvc.names\r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH   = ../../openssl-0.9.8y\r
+OPENSSL_PATH   = ../../openssl-0.9.8zc\r
 !ENDIF\r
 \r
 !IFNDEF LIBSSH2_PATH\r
@@ -130,6 +130,10 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include
 CFLAGS = $(CFLAGS) /DUSE_IPV6\r
 !ENDIF\r
 \r
+!IFDEF USE_IDN\r
+CFLAGS = $(CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES\r
+!ENDIF\r
+\r
 ##############################################################\r
 # Runtime library configuration\r
 \r
@@ -531,6 +535,7 @@ X_OBJS= \
        $(DIROBJ)\cookie.obj \\r
        $(DIROBJ)\curl_addrinfo.obj \\r
        $(DIROBJ)\curl_darwinssl.obj \\r
+       $(DIROBJ)\curl_endian.obj \\r
        $(DIROBJ)\curl_fnmatch.obj \\r
        $(DIROBJ)\curl_gethostname.obj \\r
        $(DIROBJ)\curl_gssapi.obj \\r
@@ -542,6 +547,7 @@ X_OBJS= \
        $(DIROBJ)\curl_ntlm_wb.obj \\r
        $(DIROBJ)\curl_rtmp.obj \\r
        $(DIROBJ)\curl_sasl.obj \\r
+       $(DIROBJ)\curl_sasl_gssapi.obj \\r
        $(DIROBJ)\curl_sasl_sspi.obj \\r
        $(DIROBJ)\curl_schannel.obj \\r
        $(DIROBJ)\curl_sspi.obj \\r
@@ -599,7 +605,6 @@ X_OBJS= \
        $(DIROBJ)\polarssl_threadlock.obj \\r
        $(DIROBJ)\pop3.obj \\r
        $(DIROBJ)\progress.obj \\r
-       $(DIROBJ)\qssl.obj \\r
        $(DIROBJ)\rawstr.obj \\r
        $(DIROBJ)\rtsp.obj \\r
        $(DIROBJ)\security.obj \\r
@@ -607,6 +612,7 @@ X_OBJS= \
        $(DIROBJ)\sendf.obj \\r
        $(DIROBJ)\share.obj \\r
        $(DIROBJ)\slist.obj \\r
+       $(DIROBJ)\smb.obj \\r
        $(DIROBJ)\smtp.obj \\r
        $(DIROBJ)\socks.obj \\r
        $(DIROBJ)\socks_gssapi.obj \\r