Commit 9dd3e4d4 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

- Georg Lippitsch made the src/Makefile.vc6 makefile use the same memory model 

  options as the lib/Makefile.vc6 already did.
parent 1d95109f

CHANGES

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




                                  Changelog

                                  Changelog





Daniel S (22 Feb 2008)

- Georg Lippitsch made the src/Makefile.vc6 makefile use the same memory model

  options as the lib/Makefile.vc6 already did.



Daniel S (21 Feb 2008)

Daniel S (21 Feb 2008)

- Zmey Petroff found a crash when libcurl accessed a NULL pointer, which

- Zmey Petroff found a crash when libcurl accessed a NULL pointer, which

  happened if you set the connection cache size to 1 and for example failed to

  happened if you set the connection cache size to 1 and for example failed to

RELEASE-NOTES

+1 −1
Original line number Original line Diff line number Diff line
@@ -48,6 +48,6 @@ advice from friends like these: 




 Michal Marek, Dmitry Kurochkin, Niklas Angebrand, Günter Knauf, Yang Tse,

 Michal Marek, Dmitry Kurochkin, Niklas Angebrand, Günter Knauf, Yang Tse,

 Dan Fandrich, Mike Hommey, Pooyan McSporran, Jerome Muffat-Meridol,

 Dan Fandrich, Mike Hommey, Pooyan McSporran, Jerome Muffat-Meridol,

 Kaspar Brand, Gautam Kachroo, Zmey Petroff

 Kaspar Brand, Gautam Kachroo, Zmey Petroff, Georg Lippitsch





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

src/Makefile.vc6

+11 −2
Original line number Original line Diff line number Diff line
@@ -61,13 +61,22 @@ SSL_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32" 
SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"

SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"

SSL_LIBS       = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib

SSL_LIBS       = libeay32.lib ssleay32.lib gdi32.lib user32.lib advapi32.lib





# Runtime library configuration

RTLIB   = /MD

RTLIBD  = /MDd



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

RTLIB  = /MT

RTLIBD = /MTd

!ENDIF



## Release

## Release

CCR   = cl.exe /MD /O2 /DNDEBUG

CCR   = cl.exe $(RTLIB) /O2 /DNDEBUG

LINKR = link.exe /incremental:no /libpath:"../lib"

LINKR = link.exe /incremental:no /libpath:"../lib"

RCR   = rc.exe /dCURLDEBUG=0

RCR   = rc.exe /dCURLDEBUG=0





## Debug

## Debug

CCD   = cl.exe /MDd /Gm /ZI /Od /D_DEBUG /GZ

CCD   = cl.exe $(RTLIBD) /Gm /ZI /Od /D_DEBUG /GZ

LINKD = link.exe /incremental:yes /debug /libpath:"../lib"

LINKD = link.exe /incremental:yes /debug /libpath:"../lib"

RCD   = rc.exe /dCURLDEBUG=1

RCD   = rc.exe /dCURLDEBUG=1