Imported Upstream version 7.27.0

1 files changed, 41 insertions, 39 deletions

diff --git a/lib/Makefile.vc10 b/lib/Makefile.vc10
index 51ca387a..6343cb02 100644
--- a/lib/Makefile.vc10
+++ b/lib/Makefile.vc10
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___

 #                             \___|\___/|_| \_\_____|

 #

-# Copyright (C) 1999 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

+# Copyright (C) 1999 - 2012, 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

@@ -22,7 +22,7 @@
 

 # All files in the Makefile.vc* series are generated automatically from the

 # one made for MSVC version 6. Alas, if you want to do changes to any of the

-# fiels and send back to the project, edit the version six, make your diff and

+# files and send back to the project, edit the version six, make your diff and

 # mail curl-library.

 

 ###########################################################################

@@ -190,6 +190,20 @@ CFGSET   = TRUE
 !ENDIF

 

 ######################

+# release-ssl-ssh2-zlib

+

+!IF "$(CFG)" == "release-ssl-ssh2-zlib"

+TARGET   = $(LIBCURL_STA_LIB_REL)

+DIROBJ   = $(CFG)

+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"

+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

+LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)

+CFGSET   = TRUE

+!ENDIF

+

+######################

 # release-ssl-dll

 

 !IF "$(CFG)" == "release-ssl-dll"

@@ -227,36 +241,6 @@ CFGSET   = TRUE
 !ENDIF

 

 ######################

-# release-ssl-ssh2-zlib

-

-!IF "$(CFG)" == "release-ssl-ssh2-zlib"

-TARGET   = $(LIB_NAME).lib

-DIROBJ   = $(CFG)

-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

-LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"

-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

-LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)

-CFGSET   = TRUE

-RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib

-!ENDIF

-

-######################

-# debug-ssl-ssh2-zlib

-

-!IF "$(CFG)" == "debug-ssl-ssh2-zlib"

-TARGET   = $(LIB_NAME_DEBUG).lib

-DIROBJ   = $(CFG)

-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

-LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"

-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

-LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)

-CFGSET   = TRUE

-RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib

-!ENDIF

-

-######################

 # release-dll

 

 !IF "$(CFG)" == "release-dll"

@@ -357,6 +341,20 @@ CFGSET   = TRUE
 !ENDIF

 

 ######################

+# debug-ssl-ssh2-zlib

+

+!IF "$(CFG)" == "debug-ssl-ssh2-zlib"

+TARGET   = $(LIBCURL_STA_LIB_DBG)

+DIROBJ   = $(CFG)

+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"

+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

+LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)

+CFGSET   = TRUE

+!ENDIF

+

+######################

 # debug-ssl-dll

 

 !IF "$(CFG)" == "debug-ssl-dll"

@@ -463,11 +461,11 @@ RESOURCE = $(DIROBJ)\libcurl.res
 !MESSAGE   release-dll-ssl-dll          - release dynamic library with dynamic ssl

 !MESSAGE   release-dll-zlib-dll         - release dynamic library with dynamic zlib

 !MESSAGE   release-dll-ssl-dll-zlib-dll - release dynamic library with dynamic ssl and dynamic zlib

-!MESSAGE   debug-ssl-ssh2-zlib          - debug static library with ssl, ssh2 and zlib

 !MESSAGE   debug                        - debug static library

 !MESSAGE   debug-ssl                    - debug static library with ssl

 !MESSAGE   debug-zlib                   - debug static library with zlib

 !MESSAGE   debug-ssl-zlib               - debug static library with ssl and zlib

+!MESSAGE   debug-ssl-ssh2-zlib          - debug static library with ssl, ssh2 and zlib

 !MESSAGE   debug-ssl-dll                - debug static library with dynamic ssl

 !MESSAGE   debug-zlib-dll               - debug static library with dynamic zlib

 !MESSAGE   debug-ssl-dll-zlib-dll       - debug static library with dynamic ssl and dynamic zlib

@@ -503,25 +501,29 @@ X_OBJS= \
 	$(DIROBJ)\content_encoding.obj \

 	$(DIROBJ)\cookie.obj \

 	$(DIROBJ)\curl_addrinfo.obj \

+	$(DIROBJ)\curl_darwinssl.obj \

 	$(DIROBJ)\curl_fnmatch.obj \

 	$(DIROBJ)\curl_gethostname.obj \

 	$(DIROBJ)\curl_memrchr.obj \

+	$(DIROBJ)\curl_multibyte.obj \

 	$(DIROBJ)\curl_ntlm.obj \

 	$(DIROBJ)\curl_ntlm_core.obj \

 	$(DIROBJ)\curl_ntlm_msgs.obj \

 	$(DIROBJ)\curl_ntlm_wb.obj \

 	$(DIROBJ)\curl_rand.obj \

 	$(DIROBJ)\curl_rtmp.obj \

+	$(DIROBJ)\curl_sasl.obj \

+	$(DIROBJ)\curl_schannel.obj \

 	$(DIROBJ)\curl_sspi.obj \

 	$(DIROBJ)\curl_threads.obj \

 	$(DIROBJ)\dict.obj \

 	$(DIROBJ)\easy.obj \

 	$(DIROBJ)\escape.obj \

-	$(DIROBJ)\fileinfo.obj \

 	$(DIROBJ)\file.obj \

+	$(DIROBJ)\fileinfo.obj \

 	$(DIROBJ)\formdata.obj \

-	$(DIROBJ)\ftplistparser.obj \

 	$(DIROBJ)\ftp.obj \

+	$(DIROBJ)\ftplistparser.obj \

 	$(DIROBJ)\getenv.obj \

 	$(DIROBJ)\getinfo.obj \

 	$(DIROBJ)\gopher.obj \

@@ -529,15 +531,15 @@ X_OBJS= \
 	$(DIROBJ)\hash.obj \

 	$(DIROBJ)\hmac.obj \

 	$(DIROBJ)\hostasyn.obj \

+	$(DIROBJ)\hostip.obj \

 	$(DIROBJ)\hostip4.obj \

 	$(DIROBJ)\hostip6.obj \

-	$(DIROBJ)\hostip.obj \

 	$(DIROBJ)\hostsyn.obj \

+	$(DIROBJ)\http.obj \

 	$(DIROBJ)\http_chunks.obj \

 	$(DIROBJ)\http_digest.obj \

 	$(DIROBJ)\http_negotiate.obj \

-        $(DIROBJ)\http_negotiate_sspi.obj \

-	$(DIROBJ)\http.obj \

+	$(DIROBJ)\http_negotiate_sspi.obj \

 	$(DIROBJ)\http_proxy.obj \

 	$(DIROBJ)\if2ip.obj \

 	$(DIROBJ)\imap.obj \

@@ -565,8 +567,8 @@ X_OBJS= \
 	$(DIROBJ)\share.obj \

 	$(DIROBJ)\slist.obj \

 	$(DIROBJ)\smtp.obj \

-	$(DIROBJ)\socks_gssapi.obj \

 	$(DIROBJ)\socks.obj \

+	$(DIROBJ)\socks_gssapi.obj \

 	$(DIROBJ)\socks_sspi.obj \

 	$(DIROBJ)\speedcheck.obj \

 	$(DIROBJ)\splay.obj \