aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-02-22 22:53:01 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-02-22 22:53:01 +0000
commit9dd3e4d48140a0852a3f86bd91a691645be319d8 (patch)
tree1a0ef9038fb92bc6fd4f7b8ff140564c53fbb362
parent1d95109ffa685a30c806b4192874b2f387400aca (diff)
- Georg Lippitsch made the src/Makefile.vc6 makefile use the same memory model
options as the lib/Makefile.vc6 already did.
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES2
-rw-r--r--src/Makefile.vc613
3 files changed, 16 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 95cb39cf4..01c742eeb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
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)
- 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
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5b3ed07c1..378f67c64 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -48,6 +48,6 @@ advice from friends like these:
Michal Marek, Dmitry Kurochkin, Niklas Angebrand, Günter Knauf, Yang Tse,
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)
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index f82e01229..fbcfbf9e8 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -61,13 +61,22 @@ 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
+# Runtime library configuration
+RTLIB = /MD
+RTLIBD = /MDd
+
+!IF "$(RTLIBCFG)" == "static"
+RTLIB = /MT
+RTLIBD = /MTd
+!ENDIF
+
## Release
-CCR = cl.exe /MD /O2 /DNDEBUG
+CCR = cl.exe $(RTLIB) /O2 /DNDEBUG
LINKR = link.exe /incremental:no /libpath:"../lib"
RCR = rc.exe /dCURLDEBUG=0
## 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"
RCD = rc.exe /dCURLDEBUG=1