Imported Upstream version 7.40.0

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

diff --git a/lib/Makefile.vc8 b/lib/Makefile.vc8
index e0f851d..0d10ac5 100644 (file)
--- a/lib/Makefile.vc8
+++ b/lib/Makefile.vc8
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.\r
 #\r
 # This software is licensed as described in the file COPYING, which\r
 # you should have received as part of this distribution. The terms\r
@@ -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
@@ -166,6 +170,18 @@ CFGSET   = TRUE
 !ENDIF\r
 \r
 ######################\r
+# release-winssl\r
+\r
+!IF "$(CFG)" == "release-winssl"\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
+DIROBJ   = $(CFG)\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LNK      = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL) $(CFLAGSLIB)\r
+CFGSET   = TRUE\r
+!ENDIF\r
+\r
+######################\r
 # release-zlib\r
 \r
 !IF "$(CFG)" == "release-zlib"\r
@@ -519,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
@@ -530,6 +547,8 @@ 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
        $(DIROBJ)\curl_threads.obj \\r
@@ -566,7 +585,6 @@ X_OBJS= \
        $(DIROBJ)\imap.obj \\r
        $(DIROBJ)\inet_ntop.obj \\r
        $(DIROBJ)\inet_pton.obj \\r
-       $(DIROBJ)\krb4.obj \\r
        $(DIROBJ)\krb5.obj \\r
        $(DIROBJ)\ldap.obj \\r
        $(DIROBJ)\llist.obj \\r
@@ -587,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
@@ -595,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
@@ -602,8 +620,8 @@ X_OBJS= \
        $(DIROBJ)\speedcheck.obj \\r
        $(DIROBJ)\splay.obj \\r
        $(DIROBJ)\ssh.obj \\r
-       $(DIROBJ)\sslgen.obj \\r
-       $(DIROBJ)\ssluse.obj \\r
+       $(DIROBJ)\vtls.obj \\r
+       $(DIROBJ)\openssl.obj \\r
        $(DIROBJ)\strdup.obj \\r
        $(DIROBJ)\strequal.obj \\r
        $(DIROBJ)\strerror.obj \\r
@@ -642,6 +660,9 @@ $(DIROBJ):
 {.\}.c{$(DIROBJ)\}.obj:\r
        $(CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
+{.\vtls\}.c{$(DIROBJ)\}.obj:\r
+       $(CC) $(CFLAGS) /Fo"$@"  $<\r
+\r
 debug-dll\libcurl.res \\r
 debug-dll-ssl-dll\libcurl.res \\r
 debug-dll-zlib-dll\libcurl.res \\r