Commit 715b706c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Temprimus improved the MSVC makefile so that the static debug SSL libs are 

linked to the executable and not to the libcurld.lib
http://curl.haxx.se/bug/view.cgi?id=1326676
parent bfa9c42c

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 




Daniel (21 October 2005)

- Temprimus improved the MSVC makefile so that the static debug SSL libs are

  linked to the executable and not to the libcurld.lib

  http://curl.haxx.se/bug/view.cgi?id=1326676



- Bradford Bruce made the windows resolver code properly return

  CURLE_COULDNT_RESOLVE_PROXY and CURLE_COULDNT_RESOLVE_HOST on resolving

  errors (as documented).

RELEASE-NOTES

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Curl and libcurl 7.15.1 


This release includes the following changes:



 o 

 o improved MSVC makefile



This release includes the following bugfixes:
@@ -28,6 +28,6 @@ Other curl-related news since the previous public release: 
This release would not have looked like this without help, code, reports and

advice from friends like these:



 Dave Dribin, Bradford Bruce

 Dave Dribin, Bradford Bruce, Temprimus



        Thanks! (and sorry if I forgot to mention someone)

lib/Makefile.vc6

+13 −25
Original line number Diff line number Diff line
@@ -115,18 +115,6 @@ CC = $(CCNODBG) $(RTLIB) $(CFLAGSLIB) 
CFGSET = TRUE

!ENDIF



##############################################################

# Runtime library configuration



RTLIB   = /MD

RTLIBD  = /MDd



!IF "$(RTLIBCFG)" == "static"

RTLIB  = /MT

RTLIBD = /MTd

!ENDIF





######################

# release-zlib
@@ -271,7 +259,7 @@ CFGSET = TRUE 
TARGET   = $(LIB_NAME_DEBUG).lib

DIROBJ   = $(CFG)

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

LNK      = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)

LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)

CFGSET   = TRUE

!ENDIF
@@ -308,7 +296,7 @@ TARGET = $(LIB_NAME_DEBUG).lib 
DIROBJ   = $(CFG)

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

LNK      = $(LNKLIB) $(SSLLIBS) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

CFGSET   = TRUE

!ENDIF