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

diff --git a/CHANGES b/CHANGES
index df4fd6c22cf23246e471a52f923198e6380d2ece..452e46bd6625fa2d9872f4b13c92a394eeb1d0d6 100644 (file)
--- 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 39a894b3e7d96fb8d133a140256e6a38f59cb91e..381b7a2888d8f1787d3d7b0e1eea12c4842cad94 100644 (file)
--- 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 edc4c5c26a3643e492707b6daf4e7e0ad9b3bc7e..304703ec32a09ccfaed443cbeffc1cbcffb0a2e1 100644 (file)
--- 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\r
 !ENDIF\r
 \r
-##############################################################
-# Runtime library configuration
-
-RTLIB   = /MD
-RTLIBD  = /MDd
-
-!IF "$(RTLIBCFG)" == "static"
-RTLIB  = /MT
-RTLIBD = /MTd
-!ENDIF
-
-
-######################\r
-# release\r
-\r
-!IF "$(CFG)" == "release"\r
-TARGET = $(LIB_NAME).lib\r
-DIROBJ = $(CFG)\r
-LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC     = $(CCNODBG) $(RTLIB) $(CFLAGSLIB)\r
-CFGSET = TRUE\r
-!ENDIF\r
-\r
 ##############################################################\r
 # Runtime library configuration\r
 \r
@@ -127,6 +104,17 @@ RTLIBD = /MTd
 !ENDIF\r
 \r
 \r
+######################\r
+# release\r
+\r
+!IF "$(CFG)" == "release"\r
+TARGET = $(LIB_NAME).lib\r
+DIROBJ = $(CFG)\r
+LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC     = $(CCNODBG) $(RTLIB) $(CFLAGSLIB)\r
+CFGSET = TRUE\r
+!ENDIF\r
+\r
 ######################\r
 # release-zlib\r
 \r
@@ -271,7 +259,7 @@ CFGSET = TRUE
 TARGET   = $(LIB_NAME_DEBUG).lib\r
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
-LNK      = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
+LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
@@ -308,7 +296,7 @@ TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
-LNK      = $(LNKLIB) $(SSLLIBS) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r