Temprimus improved the MSVC makefile: "makes a build option available so if

you set rtlibcfg=static for the make, then it would build with /MT. The
default behaviour is /MD (the original)."
http://curl.haxx.se/bug/view.cgi?id=1326665

diff --git a/CHANGES b/CHANGES
index ccfac04a97992c1e7dcb481f8df75c1311410788..2c5b455c2f795b602fd47b21085767585dc3f785 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,12 @@
 
 
 
+Daniel (20 October 2005)
+- Temprimus improved the MSVC makefile: "makes a build option available so if
+  you set rtlibcfg=static for the make, then it would build with /MT. The
+  default behaviour is /MD (the original)."
+  http://curl.haxx.se/bug/view.cgi?id=1326665
+
 Daniel (14 October 2005)
 - Reverted the LIBCURL_VERSION_NUM change from October 6. As Dave Dribin
   reported, the define is used by the configure script and is assumed to use

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 14bbe4142a048ab7a953ebb1ed03876090564dd9..edc4c5c26a3643e492707b6daf4e7e0ad9b3bc7e 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -19,7 +19,6 @@
 # files in the "cfg" directory, but then the make file\r
 # in \src would need to be changed.\r
 #\r
-# $Id: Makefile.vc6,v 1.17 2004/01/13 08:57:01 bagder Exp $\r
 ##############################################################\r
 \r
 #\r
@@ -67,8 +66,8 @@ USEMM_LIBS = YES
 #############################################################\r
 ## Nothing more to do below this line!\r
 \r
-CCNODBG    = cl.exe /MT /O2 /DNDEBUG\r
-CCDEBUG    = cl.exe /MTd /Od /Gm /Zi /D_DEBUG /GZ\r
+CCNODBG    = cl.exe /O2 /DNDEBUG\r
+CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ\r
 CFLAGSSSL  = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
 CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
 CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL\r
@@ -93,6 +92,18 @@ 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
@@ -100,10 +111,22 @@ LFLAGS = $(LFLAGS) $(WINDOWS_SDK_PATH)\lib\secur32.lib
 TARGET = $(LIB_NAME).lib\r
 DIROBJ = $(CFG)\r
 LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC     = $(CCNODBG) $(CFLAGSLIB)\r
+CC     = $(CCNODBG) $(RTLIB) $(CFLAGSLIB)\r
 CFGSET = TRUE\r
 !ENDIF\r
 \r
+##############################################################\r
+# Runtime library configuration\r
+\r
+RTLIB   = /MD\r
+RTLIBD  = /MDd\r
+\r
+!IF "$(RTLIBCFG)" == "static"\r
+RTLIB  = /MT\r
+RTLIBD = /MTd\r
+!ENDIF\r
+\r
+\r
 ######################\r
 # release-zlib\r
 \r
@@ -112,7 +135,7 @@ TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -122,7 +145,7 @@ CFGSET   = TRUE
 !IF "$(CFG)" == "release-dll"\r
 TARGET = $(LIB_NAME).dll\r
 DIROBJ = $(CFG)\r
-LNK    = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
+LNK    = $(LNKDLL) $(RTLIB) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
 CC     = $(CCNODBG)\r
 CFGSET = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -136,7 +159,7 @@ TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSLIB)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -148,7 +171,7 @@ TARGET   = $(LIB_NAME).dll
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
 LNK      = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) $(SSLLIBS) $(LFLAGSSSL) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
-CC       = $(CCNODBG) $(CFLAGSSSL)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -161,7 +184,7 @@ DIROBJ   = $(CFG)
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -173,7 +196,7 @@ TARGET   = $(LIB_NAME).dll
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
-CC       = $(CCNODBG) $(CFLAGSSSL)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r
@@ -186,7 +209,7 @@ TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -199,7 +222,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -211,7 +234,7 @@ TARGET   = $(LIB_NAME).dll
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
-CC       = $(CCNODBG) $(CFLAGSZLIB)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r
@@ -225,7 +248,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
-CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r
@@ -237,7 +260,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 TARGET = $(LIB_NAME_DEBUG).lib\r
 DIROBJ = $(CFG)\r
 LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC     = $(CCDEBUG) $(CFLAGSLIB)\r
+CC     = $(CCDEBUG) $(RTLIBD) $(CFLAGSLIB)\r
 CFGSET = TRUE\r
 !ENDIF\r
 \r
@@ -249,7 +272,7 @@ TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
 LNK      = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSLIB)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -261,7 +284,7 @@ TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -273,7 +296,7 @@ TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)\out32dll\r
 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSLIB)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -286,7 +309,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
 LNK      = $(LNKLIB) $(SSLLIBS) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -298,7 +321,7 @@ TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -311,7 +334,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -322,7 +345,7 @@ CFGSET   = TRUE
 TARGET = $(LIB_NAME_DEBUG).dll\r
 DIROBJ = $(CFG)\r
 LNK    = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb\r
-CC     = $(CCDEBUG)\r
+CC     = $(CCDEBUG) $(RTLIBD) \r
 CFGSET = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r
@@ -335,7 +358,7 @@ TARGET   = $(LIB_NAME_DEBUG).dll
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb\r
-CC       = $(CCDEBUG) $(CFLAGSSSL)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r
@@ -348,7 +371,7 @@ TARGET   = $(LIB_NAME_DEBUG).dll
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb\r
-CC       = $(CCDEBUG) $(CFLAGSZLIB)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r
@@ -362,7 +385,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb\r
-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r