Revert "Update to 7.40.1"

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

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index c8693af..fc9464d 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2013, 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
@@ -56,7 +56,7 @@ PROGRAM_NAME = curl.exe
 \r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH = ../../openssl-0.9.8zc\r
+OPENSSL_PATH = ../../openssl-0.9.8y\r
 !ENDIF\r
 \r
 !IFNDEF ZLIB_PATH\r
@@ -90,24 +90,19 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK"
 ########################################################\r
 ## Nothing more to do below this line!\r
 \r
-ZLIB_CFLAGS    = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
-ZLIB_LFLAGS    = "/LIBPATH:$(ZLIB_PATH)"\r
-ZLIB_LIBS      = zlib.lib\r
-ZLIB_IMP_LIBS  = zdll.lib\r
+ZLIB_CFLAGS   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
+ZLIB_LFLAGS   = "/LIBPATH:$(ZLIB_PATH)"\r
+ZLIB_LIBS     = zlib.lib\r
+ZLIB_IMP_LIBS = zdll.lib\r
 \r
 SSL_CFLAGS     = /DUSE_SSLEAY\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
-WINLIBS        = ws2_32.lib wldap32.lib advapi32.lib\r
 \r
 WINSSL_CFLAGS  = /DUSE_SCHANNEL\r
 #WINSSL_LIBS    = gdi32.lib user32.lib\r
 \r
-!IFDEF USE_IDN\r
-WINLIBS        = $(WINLIBS) normaliz.lib\r
-!ENDIF\r
-\r
 # Runtime library configuration\r
 RTLIB   = /MD\r
 RTLIBD  = /MDd\r
@@ -345,8 +340,9 @@ LINKLIBS_DEBUG = $(LIBCURL_IMP_LIB_DBG) $(SSL_LIBS) $(ZLIB_IMP_LIBS)
 LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)\r
 !ENDIF\r
 \r
-LINKLIBS       = $(LINKLIBS) $(WINLIBS)\r
-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(WINLIBS)\r
+\r
+LINKLIBS       = $(LINKLIBS) ws2_32.lib wldap32.lib advapi32.lib\r
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) ws2_32.lib wldap32.lib advapi32.lib\r
 \r
 all : release\r
 \r