Makefile.vc6: Added version.lib if built with SSPI

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 621c6e64f1824e7fe95a088fe89d0a92a760dc23..205b433a317c2163894fe30abf7d214e16893cbd 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2012, 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
@@ -22,7 +22,7 @@
 \r
 # All files in the Makefile.vc* series are generated automatically from the\r
 # one made for MSVC version 6. Alas, if you want to do changes to any of the\r
-# fiels and send back to the project, edit the version six, make your diff and\r
+# files and send back to the project, edit the version six, make your diff and\r
 # mail curl-library.\r
 \r
 ###########################################################################\r
@@ -123,6 +123,7 @@ CFGSET     = FALSE
 \r
 !IFDEF WINDOWS_SSPI\r
 CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include\r
+WINLIBS = $(WINLIBS) version.lib\r
 !ENDIF\r
 \r
 !IFDEF USE_IPV6\r

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index f8b30669bab1604cd58d11ddf07152e544a97e6b..6da0877b9e8de8339bf84db269488a2955cc057e 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -22,7 +22,7 @@
 \r
 # All files in the Makefile.vc* series are generated automatically from the\r
 # one made for MSVC version 6. Alas, if you want to do changes to any of the\r
-# fiels and send back to the project, edit the version six, make your diff and\r
+# files and send back to the project, edit the version six, make your diff and\r
 # mail curl-users.\r
 \r
 #############################################################\r
@@ -90,6 +90,7 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK"
 \r
 ########################################################\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
@@ -100,6 +101,8 @@ SSL_LFLAGS     = /LIBPATH:"$(OPENSSL_PATH)/out32"
 SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"\r
 SSL_LIBS       = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib\r
 \r
+WINLIBS        = ws2_32.lib wldap32.lib\r
+\r
 # Runtime library configuration\r
 RTLIB   = /MD\r
 RTLIBD  = /MDd\r
@@ -226,6 +229,9 @@ DEBUG_OBJS= \
 CFLAGS         = $(CFLAGS) /DCURL_STATICLIB\r
 LINKLIBS       = $(LIBCURL_STA_LIB_REL)\r
 LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG)\r
+!IFDEF WINDOWS_SSPI\r
+WINLIBS = $(WINLIBS) version.lib\r
+!ENDIF\r
 \r
 #################################################\r
 # release dynamic library\r
@@ -243,6 +249,9 @@ CFLAGS         = $(CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
 LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(ZLIB_LIBS)\r
 LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(ZLIB_LIBS)\r
 LFLAGS         = $(LFLAGS) $(ZLIB_LFLAGS)\r
+!IFDEF WINDOWS_SSPI\r
+WINLIBS = $(WINLIBS) version.lib\r
+!ENDIF\r
 !ENDIF\r
 \r
 #################################################\r
@@ -253,6 +262,9 @@ CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) /DCURL_STATICLIB
 LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS)\r
 LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_LFLAGS)\r
+!IFDEF WINDOWS_SSPI\r
+WINLIBS = $(WINLIBS) version.lib\r
+!ENDIF\r
 !ENDIF\r
 \r
 #################################################\r
@@ -273,6 +285,9 @@ CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
 LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS) $(ZLIB_LIBS)\r
 LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS) $(ZLIB_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS)\r
+!IFDEF WINDOWS_SSPI\r
+WINLIBS = $(WINLIBS) version.lib\r
+!ENDIF\r
 !ENDIF\r
 \r
 #################################################\r
@@ -283,6 +298,9 @@ CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) /DCURL_STATICLIB
 LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS)\r
 LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS)\r
+!IFDEF WINDOWS_SSPI\r
+WINLIBS = $(WINLIBS) version.lib\r
+!ENDIF\r
 !ENDIF\r
 \r
 #################################################\r
@@ -293,6 +311,9 @@ CFLAGS         = $(CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
 LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(ZLIB_IMP_LIBS)\r
 LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(ZLIB_IMP_LIBS)\r
 LFLAGS         = $(LFLAGS) $(ZLIB_LFLAGS)\r
+!IFDEF WINDOWS_SSPI\r
+WINLIBS = $(WINLIBS) version.lib\r
+!ENDIF\r
 !ENDIF\r
 \r
 #################################################\r
@@ -313,6 +334,9 @@ CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
 LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
 LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)\r
+!IFDEF WINDOWS_SSPI\r
+WINLIBS = $(WINLIBS) version.lib\r
+!ENDIF\r
 !ENDIF\r
 \r
 #################################################\r
@@ -326,8 +350,8 @@ LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)
 !ENDIF\r
 \r
 \r
-LINKLIBS       = $(LINKLIBS) ws2_32.lib wldap32.lib\r
-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) ws2_32.lib wldap32.lib\r
+LINKLIBS       = $(LINKLIBS) $(WINLIBS)\r
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(WINLIBS)\r
 \r
 all : release\r
 \r