diff options
author | Yang Tse <yangsita@gmail.com> | 2012-06-13 15:53:51 +0200 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2012-06-13 16:42:48 +0200 |
commit | 819afe46eeab2c7fa4738e4d77fa2a79a7bb8ebe (patch) | |
tree | 14bb997f237faf1249737cd0580fda083bdab5e9 /src/Makefile.vc6 | |
parent | c13af843727c06ffec1031129ec5c30dfcd5066e (diff) |
schannel: remove version number and identify its use with 'schannel' literal
Version number is removed in order to make this info consistent with
how we do it with other MS and Linux system libraries for which we don't
provide this info.
Identifier changed from 'WinSSPI' to 'schannel' given that this is the
actual provider of the SSL/TLS support. libcurl can still be built with
SSPI and without SCHANNEL support.
Diffstat (limited to 'src/Makefile.vc6')
-rw-r--r-- | src/Makefile.vc6 | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 6da0877b9..a939d1514 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -101,8 +101,6 @@ SSL_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32" SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"
SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib
-WINLIBS = ws2_32.lib wldap32.lib
-
# Runtime library configuration
RTLIB = /MD
RTLIBD = /MDd
@@ -229,9 +227,6 @@ DEBUG_OBJS= \ CFLAGS = $(CFLAGS) /DCURL_STATICLIB
LINKLIBS = $(LIBCURL_STA_LIB_REL)
LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG)
-!IFDEF WINDOWS_SSPI
-WINLIBS = $(WINLIBS) version.lib
-!ENDIF
#################################################
# release dynamic library
@@ -249,9 +244,6 @@ CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB LINKLIBS = $(LIBCURL_STA_LIB_REL) $(ZLIB_LIBS)
LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(ZLIB_LIBS)
LFLAGS = $(LFLAGS) $(ZLIB_LFLAGS)
-!IFDEF WINDOWS_SSPI
-WINLIBS = $(WINLIBS) version.lib
-!ENDIF
!ENDIF
#################################################
@@ -262,9 +254,6 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS) /DCURL_STATICLIB LINKLIBS = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS)
LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS)
LFLAGS = $(LFLAGS) $(SSL_LFLAGS)
-!IFDEF WINDOWS_SSPI
-WINLIBS = $(WINLIBS) version.lib
-!ENDIF
!ENDIF
#################################################
@@ -285,9 +274,6 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB LINKLIBS = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS) $(ZLIB_LIBS)
LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS) $(ZLIB_LIBS)
LFLAGS = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS)
-!IFDEF WINDOWS_SSPI
-WINLIBS = $(WINLIBS) version.lib
-!ENDIF
!ENDIF
#################################################
@@ -298,9 +284,6 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS) /DCURL_STATICLIB LINKLIBS = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS)
LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS)
LFLAGS = $(LFLAGS) $(SSL_IMP_LFLAGS)
-!IFDEF WINDOWS_SSPI
-WINLIBS = $(WINLIBS) version.lib
-!ENDIF
!ENDIF
#################################################
@@ -311,9 +294,6 @@ CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB LINKLIBS = $(LIBCURL_STA_LIB_REL) $(ZLIB_IMP_LIBS)
LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(ZLIB_IMP_LIBS)
LFLAGS = $(LFLAGS) $(ZLIB_LFLAGS)
-!IFDEF WINDOWS_SSPI
-WINLIBS = $(WINLIBS) version.lib
-!ENDIF
!ENDIF
#################################################
@@ -334,9 +314,6 @@ CFLAGS = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB LINKLIBS = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS) $(ZLIB_IMP_LIBS)
LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS) $(ZLIB_IMP_LIBS)
LFLAGS = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)
-!IFDEF WINDOWS_SSPI
-WINLIBS = $(WINLIBS) version.lib
-!ENDIF
!ENDIF
#################################################
@@ -350,8 +327,8 @@ LFLAGS = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS) !ENDIF
-LINKLIBS = $(LINKLIBS) $(WINLIBS)
-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(WINLIBS)
+LINKLIBS = $(LINKLIBS) ws2_32.lib wldap32.lib
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) ws2_32.lib wldap32.lib
all : release
|