MSVC makefiles: provide SSH build targets

"release-ssl-ssh2-zlib" and "debug-ssl-ssh2-zlib" are two new makefile
targets that build libcurl with MSVC and link with libssh2

Bug: http://curl.haxx.se/bug/view.cgi?id=3388920
Reported by: "kdekker"

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 9afcf97..3a37d37 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -64,13 +64,14 @@
 \r
 !INCLUDE ..\Makefile.msvc.names\r
 \r
-\r
-\r
-\r
 !IFNDEF OPENSSL_PATH\r
 OPENSSL_PATH   = ../../openssl-0.9.8r\r
 !ENDIF\r
 \r
+!IFNDEF LIBSSH2_PATH\r
+OPENSSH_PATH   = ../../libssh2-1.2.8\r
+!ENDIF\r
+\r
 !IFNDEF ZLIB_PATH\r
 ZLIB_PATH  = ../../zlib-1.2.5\r
 !ENDIF\r
@@ -105,6 +106,7 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK"
 CCNODBG    = cl.exe /O2 /DNDEBUG\r
 CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ\r
 CFLAGSSSL  = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\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
 CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1\r
 CFLAGSLIB  = /DCURL_STATICLIB\r
@@ -225,6 +227,36 @@ CFGSET   = TRUE
 !ENDIF\r
 \r
 ######################\r
+# release-ssl-ssh2-zlib\r
+\r
+!IF "$(CFG)" == "release-ssl-ssh2-zlib"\r
+TARGET   = $(LIB_NAME).lib\r
+DIROBJ   = $(CFG)\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CFGSET   = TRUE\r
+RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib\r
+!ENDIF\r
+\r
+######################\r
+# debug-ssl-ssh2-zlib\r
+\r
+!IF "$(CFG)" == "debug-ssl-ssh2-zlib"\r
+TARGET   = $(LIB_NAME_DEBUG).lib\r
+DIROBJ   = $(CFG)\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
+LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CFGSET   = TRUE\r
+RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib\r
+!ENDIF\r
+\r
+######################\r
 # release-dll\r
 \r
 !IF "$(CFG)" == "release-dll"\r
@@ -423,6 +455,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 !MESSAGE   release-ssl                  - release static library with ssl\r
 !MESSAGE   release-zlib                 - release static library with zlib\r
 !MESSAGE   release-ssl-zlib             - release static library with ssl and zlib\r
+!MESSAGE   release-ssl-ssh2-zlib        - release static library with ssl, ssh2 and zlib\r
 !MESSAGE   release-ssl-dll              - release static library with dynamic ssl\r
 !MESSAGE   release-zlib-dll             - release static library with dynamic zlib\r
 !MESSAGE   release-ssl-dll-zlib-dll     - release static library with dynamic ssl and dynamic zlib\r
@@ -430,6 +463,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 !MESSAGE   release-dll-ssl-dll          - release dynamic library with dynamic ssl\r
 !MESSAGE   release-dll-zlib-dll         - release dynamic library with dynamic zlib\r
 !MESSAGE   release-dll-ssl-dll-zlib-dll - release dynamic library with dynamic ssl and dynamic zlib\r
+!MESSAGE   debug-ssl-ssh2-zlib          - debug static library with ssl, ssh2 and zlib\r
 !MESSAGE   debug                        - debug static library\r
 !MESSAGE   debug-ssl                    - debug static library with ssl\r
 !MESSAGE   debug-zlib                   - debug static library with zlib\r