From 715b706caaf57e5ab1a395ea173b5f16f5b05922 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 21 Oct 2005 19:32:12 +0000
Subject: 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

---
 CHANGES          |  4 ++++
 RELEASE-NOTES    |  4 ++--
 lib/Makefile.vc6 | 38 +++++++++++++-------------------------
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/CHANGES b/CHANGES
index df4fd6c22..452e46bd6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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).
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 39a894b3e..381b7a288 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -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)
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index edc4c5c26..304703ec3 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -92,29 +92,6 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include
 LFLAGS = $(LFLAGS) $(WINDOWS_SDK_PATH)\lib\secur32.lib
 !ENDIF
 
-##############################################################
-# Runtime library configuration
-
-RTLIB   = /MD
-RTLIBD  = /MDd
-
-!IF "$(RTLIBCFG)" == "static"
-RTLIB  = /MT
-RTLIBD = /MTd
-!ENDIF
-
-
-######################
-# release
-
-!IF "$(CFG)" == "release"
-TARGET = $(LIB_NAME).lib
-DIROBJ = $(CFG)
-LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)
-CC     = $(CCNODBG) $(RTLIB) $(CFLAGSLIB)
-CFGSET = TRUE
-!ENDIF
-
 ##############################################################
 # Runtime library configuration
 
@@ -127,6 +104,17 @@ RTLIBD = /MTd
 !ENDIF
 
 
+######################
+# release
+
+!IF "$(CFG)" == "release"
+TARGET = $(LIB_NAME).lib
+DIROBJ = $(CFG)
+LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)
+CC     = $(CCNODBG) $(RTLIB) $(CFLAGSLIB)
+CFGSET = TRUE
+!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
-- 
cgit v1.2.3