Imported Upstream version 7.48.0

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

diff --git a/src/Makefile.vc8 b/src/Makefile.vc8
index 7243799..004d784 100644 (file)
--- a/src/Makefile.vc8
+++ b/src/Makefile.vc8
@@ -5,11 +5,11 @@
 #                            | (__| |_| |  _ <| |___\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
-# are also available at http://curl.haxx.se/docs/copyright.html.\r
+# are also available at https://curl.haxx.se/docs/copyright.html.\r
 #\r
 # You may opt to use, copy, modify, merge, publish, distribute and/or sell\r
 # copies of the Software, and permit persons to whom the Software is\r
@@ -56,7 +56,7 @@ PROGRAM_NAME = curl.exe
 \r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH = ../../openssl-0.9.8zc\r
+OPENSSL_PATH = ../../openssl-1.0.2a\r
 !ENDIF\r
 \r
 !IFNDEF ZLIB_PATH\r
@@ -77,7 +77,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
@@ -95,7 +95,7 @@ ZLIB_LFLAGS    = "/LIBPATH:$(ZLIB_PATH)"
 ZLIB_LIBS      = zlib.lib\r
 ZLIB_IMP_LIBS  = zdll.lib\r
 \r
-SSL_CFLAGS     = /DUSE_SSLEAY\r
+SSL_CFLAGS     = /DUSE_OPENSSL\r
 SSL_LFLAGS     = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
 SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"\r
 SSL_LIBS       = libeay32.lib ssleay32.lib gdi32.lib user32.lib\r
@@ -145,6 +145,7 @@ RELEASE_OBJS= \
        rawstrr.obj \\r
        strtoofftr.obj \\r
        warnless.obj \\r
+       slist_wc.obj \\r
        tool_binmoder.obj \\r
        tool_bnamer.obj \\r
        tool_cb_dbgr.obj \\r
@@ -190,6 +191,7 @@ DEBUG_OBJS= \
        rawstrd.obj \\r
        strtoofftd.obj \\r
        warnlessd.obj \\r
+       slist_wc.obj \\r
        tool_binmoded.obj \\r
        tool_bnamed.obj \\r
        tool_cb_dbgd.obj \\r
@@ -367,6 +369,8 @@ strtoofftr.obj: ../lib/strtoofft.c
        $(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
 warnless.obj: ../lib/warnless.c\r
        $(CCR) $(CFLAGS) /Fo"$@" ../lib/warnless.c\r
+slist_wc.obj: slist_wc.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" slist_wc.c\r
 tool_binmoder.obj: tool_binmode.c\r
        $(CCR) $(CFLAGS) /Fo"$@" tool_binmode.c\r
 tool_bnamer.obj: tool_bname.c\r
@@ -455,6 +459,8 @@ strtoofftd.obj: ../lib/strtoofft.c
        $(CCD) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
 warnlessd.obj: ../lib/warnless.c\r
        $(CCD) $(CFLAGS) /Fo"$@" ../lib/warnless.c\r
+slist_wc.obj: slist_wc.c\r
+       $(CCD) $(CFLAGS) /Fo"$@" slist_wc.c\r
 tool_binmoded.obj: tool_binmode.c\r
        $(CCD) $(CFLAGS) /Fo"$@" tool_binmode.c\r
 tool_bnamed.obj: tool_bname.c\r