Imported Upstream version 7.44.0

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

diff --git a/lib/Makefile.vc9 b/lib/Makefile.vc9
index 9f1b8d4..0d9d951 100644 (file)
--- a/lib/Makefile.vc9
+++ b/lib/Makefile.vc9
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2015, 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,11 +65,11 @@
 !INCLUDE ..\winbuild\Makefile.msvc.names\r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH   = ../../openssl-0.9.8zc\r
+OPENSSL_PATH   = ../../openssl-1.0.2a\r
 !ENDIF\r
 \r
 !IFNDEF LIBSSH2_PATH\r
-LIBSSH2_PATH   = ../../libssh2-1.4.3\r
+LIBSSH2_PATH   = ../../libssh2-1.5.0\r
 !ENDIF\r
 \r
 !IFNDEF ZLIB_PATH\r
@@ -90,7 +90,7 @@ MACHINE  = X86
 # If, for some reason the Windows SDK is installed but not installed\r
 # in the default location, you can specify WINDOWS_SDK_PATH.\r
 # It can be downloaded from:\r
-# http://www.microsoft.com/msdownload/platformsdk/sdkupdate/\r
+# https://msdn.microsoft.com/windows/bb980924.aspx\r
 \r
 # WINDOWS_SSPI = 1\r
 \r
@@ -105,7 +105,7 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK"
 \r
 CCNODBG      = cl.exe /O2 /DNDEBUG\r
 CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /RTC1\r
-CFLAGSSSL    = /DUSE_SSLEAY /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
+CFLAGSSSL    = /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
 CFLAGSWINSSL = /DUSE_SCHANNEL\r
 CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"\r
 CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
@@ -427,7 +427,7 @@ CFGSET   = TRUE
 TARGET = $(LIBCURL_DYN_LIB_DBG)\r
 DIROBJ = $(CFG)\r
 LNK    = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)\r
-CC     = $(CCDEBUG) $(RTLIBD) \r
+CC     = $(CCDEBUG) $(RTLIBD)\r
 CFGSET = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r
@@ -528,13 +528,12 @@ X_OBJS= \
        $(DIROBJ)\asyn-thread.obj \\r
        $(DIROBJ)\axtls.obj \\r
        $(DIROBJ)\base64.obj \\r
-       $(DIROBJ)\bundles.obj \\r
        $(DIROBJ)\conncache.obj \\r
        $(DIROBJ)\connect.obj \\r
        $(DIROBJ)\content_encoding.obj \\r
        $(DIROBJ)\cookie.obj \\r
        $(DIROBJ)\curl_addrinfo.obj \\r
-       $(DIROBJ)\curl_darwinssl.obj \\r
+       $(DIROBJ)\curl_des.obj \\r
        $(DIROBJ)\curl_endian.obj \\r
        $(DIROBJ)\curl_fnmatch.obj \\r
        $(DIROBJ)\curl_gethostname.obj \\r
@@ -549,10 +548,10 @@ X_OBJS= \
        $(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
        $(DIROBJ)\cyassl.obj \\r
+       $(DIROBJ)\darwinssl.obj \\r
        $(DIROBJ)\dict.obj \\r
        $(DIROBJ)\dotdot.obj \\r
        $(DIROBJ)\easy.obj \\r
@@ -607,6 +606,7 @@ X_OBJS= \
        $(DIROBJ)\progress.obj \\r
        $(DIROBJ)\rawstr.obj \\r
        $(DIROBJ)\rtsp.obj \\r
+       $(DIROBJ)\schannel.obj \\r
        $(DIROBJ)\security.obj \\r
        $(DIROBJ)\select.obj \\r
        $(DIROBJ)\sendf.obj \\r