*** /home/mikep/Makefile.vc6.src.new	Wed Mar 26 09:57:34 2008
--- curl/curl-7.18.0/src/Makefile.vc6	Wed Mar 19 08:55:51 2008
***************
*** 1,5 ****
  #############################################################
! # $Id: Makefile.vc6,v 1.1.1.1 2008-03-19 08:55:51 mikep Exp $
  #
  ## Makefile for building curl.exe with MSVC6
  ## Use: nmake -f makefile.vc6 [release | debug] [CFG=release-ssl]
--- 1,5 ----
  #############################################################
! # $Id: Makefile.vc6,v 1.1.1.1 2008/03/19 08:55:51 mikep Exp $
  #
  ## Makefile for building curl.exe with MSVC6
  ## Use: nmake -f makefile.vc6 [release | debug] [CFG=release-ssl]
***************
*** 25,34 ****
  OPENSSL_PATH = ../../openssl-0.9.8g
  !ENDIF
  
- !IFNDEF SSH2_PATH
- SSH2_PATH  = ../../libssh2-0.18
- !ENDIF
- 
  !IFNDEF MACHINE
  MACHINE  = X86
  !ENDIF
--- 25,30 ----
***************
*** 61,76 ****
  ZLIB_IMP_LIBS = zdll.lib
  
  SSL_CFLAGS     = /DUSE_SSLEAY
! SSL_LFLAGS     = /LIBPATH:"$(OPENSSL_PATH)/lib"
! SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/lib"
  SSL_LIBS       = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib
  
- SSH2_CFLAGS    = /DHAVE_LIBSSH2_H /DHAVE_SSH2 /DUSE_LIBSSH2 /DLIBSSH2_WIN32 /I "$(SSH2_PATH)/include"
- SSH2_LIBS      = libssh2.lib
- SSH2_LFLAGS     = /LIBPATH:"$(SSH2_PATH)/lib"
- SSH2_IMP_LFLAGS = /LIBPATH:"$(SSH2_PATH)/lib"
- 
- 
  ## Release
  CCR   = cl.exe /MD /O2 /DNDEBUG
  LINKR = link.exe /incremental:no /libpath:"../lib"
--- 57,66 ----
  ZLIB_IMP_LIBS = zdll.lib
  
  SSL_CFLAGS     = /DUSE_SSLEAY
! 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
  
  ## Release
  CCR   = cl.exe /MD /O2 /DNDEBUG
  LINKR = link.exe /incremental:no /libpath:"../lib"
***************
*** 162,183 ****
  !ENDIF
  
  #################################################
- # release dynamic library with dynamic ssl and libssh2
- 
- !IF "$(CFG)" == "release-dll-ssl-dll-ssh2-dll"
- CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) $(SSH2_CFLAGS)
- LINKLIBS       = libcurl_imp.lib  $(SSL_LIBS) $(SSH2_LIBS)
- LINKLIBS_DEBUG = libcurld_imp.lib $(SSL_LIBS) $(SSH2_LIBS)
- LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS) $(SSH2_IMP_FLAGS)
- !ENDIF
- 
- #################################################
  # release static library with ssl and zlib
  
  !IF "$(CFG)" == "release-ssl-zlib"
  CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
! LINKLIBS       = -L../lib libcurl.lib  $(SSL_LIBS) $(ZLIB_LIBS)
! LINKLIBS_DEBUG = -L../lib libcurld.lib $(SSL_LIBS) $(ZLIB_LIBS)
  LFLAGS         = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS)
  !ENDIF
  
--- 152,163 ----
  !ENDIF
  
  #################################################
  # release static library with ssl and zlib
  
  !IF "$(CFG)" == "release-ssl-zlib"
  CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
! LINKLIBS       = libcurl.lib  $(SSL_LIBS) $(ZLIB_LIBS)
! LINKLIBS_DEBUG = libcurld.lib $(SSL_LIBS) $(ZLIB_LIBS)
  LFLAGS         = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS)
  !ENDIF
  
***************
*** 293,296 ****
  	@-erase *.pdb 2> NUL
  	@-erase *.pch 2> NUL
  	@-erase *.ilk 2> NUL
- 
--- 273,275 ----