Imported Upstream version 7.50.2

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

diff --git a/lib/Makefile.vc11 b/lib/Makefile.vc11
index 5e09349..b610f5e 100644 (file)
--- a/lib/Makefile.vc11
+++ b/lib/Makefile.vc11
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2016, 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
@@ -115,6 +115,7 @@ LNKDLL       = link.exe /DLL
 LNKLIB       = link.exe /lib\r
 LFLAGS       = /nologo /machine:$(MACHINE)\r
 SSLLIBS      = libeay32.lib ssleay32.lib\r
+WINSSLLIBS   = crypt32.lib\r
 ZLIBLIBSDLL  = zdll.lib\r
 ZLIBLIBS     = zlib.lib\r
 WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib\r
@@ -176,7 +177,7 @@ CFGSET   = TRUE
 TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LNK      = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
+LNK      = $(LNKLIB) $(WINSSLLIBS) /out:$(DIROBJ)\$(TARGET)\r
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
@@ -213,7 +214,7 @@ CFGSET   = TRUE
 TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LNK      = $(LNKLIB) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+LNK      = $(LNKLIB) $(LFLAGSZLIB) $(WINSSLLIBS) /out:$(DIROBJ)\$(TARGET)\r
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
@@ -540,14 +541,10 @@ X_OBJS= \
        $(DIROBJ)\curl_gssapi.obj \\r
        $(DIROBJ)\curl_memrchr.obj \\r
        $(DIROBJ)\curl_multibyte.obj \\r
-       $(DIROBJ)\curl_ntlm.obj \\r
        $(DIROBJ)\curl_ntlm_core.obj \\r
-       $(DIROBJ)\curl_ntlm_msgs.obj \\r
        $(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_sspi.obj \\r
        $(DIROBJ)\curl_threads.obj \\r
        $(DIROBJ)\cyassl.obj \\r
@@ -577,7 +574,7 @@ X_OBJS= \
        $(DIROBJ)\http_chunks.obj \\r
        $(DIROBJ)\http_digest.obj \\r
        $(DIROBJ)\http_negotiate.obj \\r
-       $(DIROBJ)\http_negotiate_sspi.obj \\r
+       $(DIROBJ)\http_ntlm.obj \\r
        $(DIROBJ)\http_proxy.obj \\r
        $(DIROBJ)\idn_win32.obj \\r
        $(DIROBJ)\if2ip.obj \\r
@@ -620,6 +617,19 @@ X_OBJS= \
        $(DIROBJ)\speedcheck.obj \\r
        $(DIROBJ)\splay.obj \\r
        $(DIROBJ)\ssh.obj \\r
+       $(DIROBJ)\system_win32.obj \\r
+       $(DIROBJ)\vauth.obj \\r
+       $(DIROBJ)\cleartext.obj \\r
+       $(DIROBJ)\cram.obj \\r
+       $(DIROBJ)\digest.obj \\r
+       $(DIROBJ)\digest_sspi.obj \\r
+       $(DIROBJ)\krb5_gssapi.obj \\r
+       $(DIROBJ)\krb5_sspi.obj \\r
+       $(DIROBJ)\ntlm.obj \\r
+       $(DIROBJ)\ntlm_sspi.obj \\r
+       $(DIROBJ)\oauth2.obj \\r
+       $(DIROBJ)\spnego_gssapi.obj \\r
+       $(DIROBJ)\spnego_sspi.obj \\r
        $(DIROBJ)\vtls.obj \\r
        $(DIROBJ)\openssl.obj \\r
        $(DIROBJ)\strdup.obj \\r
@@ -635,6 +645,7 @@ X_OBJS= \
        $(DIROBJ)\version.obj \\r
        $(DIROBJ)\warnless.obj \\r
        $(DIROBJ)\wildcard.obj \\r
+        $(DIROBJ)\x509asn1.obj \\r
        $(RESOURCE)\r
 \r
 all : $(TARGET)\r
@@ -660,6 +671,9 @@ $(DIROBJ):
 {.\}.c{$(DIROBJ)\}.obj:\r
        $(CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
+{.\vauth\}.c{$(DIROBJ)\}.obj:\r
+       $(CC) $(CFLAGS) /Fo"$@"  $<\r
+\r
 {.\vtls\}.c{$(DIROBJ)\}.obj:\r
        $(CC) $(CFLAGS) /Fo"$@"  $<\r
 \r