Bugs item #3388920, was opened at 2011-08-09 11:35
Message generated for change (Comment added) made by bagder
You can respond by visiting:
https://sourceforge.net/tracker/?func=detail&atid=100976&aid=3388920&group_id=976

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: compile or build problem
Group: new feature request
>Status: Closed
Resolution: Fixed
Priority: 5
Private: No
Submitted By: kdekker (kdekker)
Assigned to: Daniel Stenberg (bagder)
Summary: please add config for Visual Studio 2005 for libssh2

Initial Comment:
The current makefile does not contain a configuration for buiilding cURL enabled with libssh2. The following diff is based on curl 7.21.7, on curl-7.21.7\lib\Makefile.vc8. The diff may be suitable (in modified form) form other visual studio based makefiles as well. The modified file is attached as well.

68a69,72
> !IFNDEF LIBSSH2_PATH
> OPENSSH_PATH = ../../libssh2-1.2.7
> !ENDIF
>
102a107
> CFLAGSSSH2 = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_P
ATH)/include"
234a240,254
> # release-ssl-ssh2-zlib
>
> !IF "$(CFG)" == "release-ssl-ssh2-zlib"
> TARGET = $(LIB_NAME).lib
> DIROBJ = $(CFG)
> LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"
> LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"
> LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
> LNK = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
> CC = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)
> CFGSET = TRUE
> RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib
> !ENDIF
>
> ######################
371a392,406
> # debug-ssl-ssh2-zlib
>
> !IF "$(CFG)" == "debug-ssl-ssh2-zlib"
> TARGET = $(LIB_NAME_DEBUG).lib
> DIROBJ = $(CFG)
> LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
> LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"
> LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"
> LNK = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
> CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)
> CFGSET = TRUE
> RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib
> !ENDIF
>
> ######################
420a456
> !MESSAGE release-ssl-ssh2-zlib - release static library with ssl, ssh2 and zlib
434a471
> !MESSAGE debug-ssl-ssh2-zlib - debug static library with ssl, ssh2 and zlib

Q:\common\thirdparty\cURL\updates\curl-7.21.7\lib>notepad Makefile.vc8

Q:\common\thirdparty\cURL\updates\curl-7.21.7\lib>ct diff -diff Makefile.vc8.org Makefile.vc8
68a69,72
> !IFNDEF LIBSSH2_PATH
> OPENSSH_PATH = ../../libssh2-1.2.8
> !ENDIF
>
102a107
> CFLAGSSSH2 = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_P
ATH)/include"
234a240,254
> # release-ssl-ssh2-zlib
>
> !IF "$(CFG)" == "release-ssl-ssh2-zlib"
> TARGET = $(LIB_NAME).lib
> DIROBJ = $(CFG)
> LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"
> LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"
> LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
> LNK = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
> CC = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)
> CFGSET = TRUE
> RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib
> !ENDIF
>
> ######################
371a392,406
> # debug-ssl-ssh2-zlib
>
> !IF "$(CFG)" == "debug-ssl-ssh2-zlib"
> TARGET = $(LIB_NAME_DEBUG).lib
> DIROBJ = $(CFG)
> LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
> LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"
> LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"
> LNK = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
> CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)
> CFGSET = TRUE
> RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib
> !ENDIF
>
> ######################
420a456
> !MESSAGE release-ssl-ssh2-zlib - release static library with ssl, ssh2 and zlib
434a471
> !MESSAGE debug-ssl-ssh2-zlib - debug static library with ssl, ssh2 and zlib

----------------------------------------------------------------------

>Comment By: Daniel Stenberg (bagder)
Date: 2011-08-18 09:31

Message:
Thanks, I've fixed that too in git now. Closing this report.

----------------------------------------------------------------------

Comment By: kdekker (kdekker)
Date: 2011-08-16 10:40

Message:
I made a small mistake:

> !IFNDEF LIBSSH2_PATH
> OPENSSH_PATH = ../../libssh2-1.2.8
> !ENDIF

should be

> !IFNDEF LIBSSH2_PATH
> LIBSSH2_PATH = ../../libssh2-1.2.8
> !ENDIF

----------------------------------------------------------------------

Comment By: Daniel Stenberg (bagder)
Date: 2011-08-15 23:24

Message:
Thanks for the report, this problem is now fixed in the git repository.

To try it out, you either checkout/update your git clone:
http://curl.haxx.se/source.html

or you try tomorrow's daily snapshot: http://curl.haxx.se/snapshots/

----------------------------------------------------------------------

Comment By: kdekker (kdekker)
Date: 2011-08-15 10:03

Message:
See diif + Makefile.vc6.

@@ -66,6 +66,10 @@
 OPENSSL_PATH = ../../openssl-0.9.8r
 !ENDIF
 
+!IFNDEF LIBSSH2_PATH
+OPENSSH_PATH = ../../libssh2-1.2.8
+!ENDIF
+
 !IFNDEF ZLIB_PATH
 ZLIB_PATH = ../../zlib-1.2.5
 !ENDIF
@@ -100,6 +104,7 @@
 CCNODBG = cl.exe /O2 /DNDEBUG
 CCDEBUG = cl.exe /Od /Gm /Zi /D_DEBUG /GZ
 CFLAGSSSL = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I
"$(OPENSSL_PATH)/inc32/openssl"
+CFLAGSSSH2 = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2
/DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I
"$(LIBSSH2_PATH)/include"
 CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
 CFLAGS = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c
/DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
 CFLAGSLIB = /DCURL_STATICLIB
@@ -232,6 +237,21 @@
 !ENDIF
 
 ######################
+# release-ssl-ssh2-zlib
+
+!IF "$(CFG)" == "release-ssl-ssh2-zlib"
+TARGET = $(LIB_NAME).lib
+DIROBJ = $(CFG)
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"
+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LNK = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB)
/out:$(DIROBJ)\$(TARGET)
+CC = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB)
$(CFLAGSLIB)
+CFGSET = TRUE
+RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib
+!ENDIF
+
+######################
 # release-dll-ssl-dll
 
 !IF "$(CFG)" == "release-dll-ssl-dll"
@@ -369,6 +389,21 @@
 !ENDIF
 
 ######################
+# debug-ssl-ssh2-zlib
+
+!IF "$(CFG)" == "debug-ssl-ssh2-zlib"
+TARGET = $(LIB_NAME_DEBUG).lib
+DIROBJ = $(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"
+LNK = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB)
/out:$(DIROBJ)\$(TARGET)
+CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB)
$(CFLAGSLIB)
+CFGSET = TRUE
+RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib
+!ENDIF
+
+######################
 # debug-dll-ssl-dll
 
 !IF "$(CFG)" == "debug-dll-ssl-dll"
@@ -418,6 +453,7 @@
 !MESSAGE release-ssl - release static library with
ssl
 !MESSAGE release-zlib - release static library with
zlib
 !MESSAGE release-ssl-zlib - release static library with ssl
and zlib
+!MESSAGE release-ssl-ssh2-zlib - release static library with
ssl, ssh2 and zlib
 !MESSAGE release-ssl-dll - release static library with
dynamic ssl
 !MESSAGE release-zlib-dll - release static library with
dynamic zlib
 !MESSAGE release-ssl-dll-zlib-dll - release static library with
dynamic ssl and dynamic zlib
@@ -432,6 +468,7 @@
 !MESSAGE debug-ssl-dll - debug static library with
dynamic ssl
 !MESSAGE debug-zlib-dll - debug static library with
dynamic zlib
 !MESSAGE debug-ssl-dll-zlib-dll - debug static library with
dynamic ssl and dynamic zlib
+!MESSAGE debug-ssl-ssh2-zlib - debug static library with ssl,
ssh2 and zlib
 !MESSAGE debug-dll - debug dynamic library
 !MESSAGE debug-dll-ssl-dll - debug dynamic library with
dynamic ssl
 !MESSAGE debug-dll-zlib-dll - debug dynamic library with
dynamic zlib1

----------------------------------------------------------------------

Comment By: Daniel Stenberg (bagder)
Date: 2011-08-13 14:51

Message:
Thanks.

Please make the diff with 'diff -u' and please make it against the
Makefile.vc6 since all Makefile.vc* files are generated from that one (only
replacing certain snippets) by the script we build release archives with.

----------------------------------------------------------------------

You can respond by visiting:
https://sourceforge.net/tracker/?func=detail&atid=100976&aid=3388920&group_id=976
Received on 2011-08-18