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

1 files changed, 48 insertions, 25 deletions

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 14bbe4142..edc4c5c26 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -19,7 +19,6 @@
 # files in the "cfg" directory, but then the make file

 # in \src would need to be changed.

 #

-# $Id: Makefile.vc6,v 1.17 2004/01/13 08:57:01 bagder Exp $

 ##############################################################

 

 #

@@ -67,8 +66,8 @@ USEMM_LIBS = YES
 #############################################################

 ## Nothing more to do below this line!

 

-CCNODBG    = cl.exe /MT /O2 /DNDEBUG

-CCDEBUG    = cl.exe /MTd /Od /Gm /Zi /D_DEBUG /GZ

+CCNODBG    = cl.exe /O2 /DNDEBUG

+CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ

 CFLAGSSSL  = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"

 CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"

 CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL

@@ -93,6 +92,18 @@ 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

 

@@ -100,10 +111,22 @@ LFLAGS = $(LFLAGS) $(WINDOWS_SDK_PATH)\lib\secur32.lib
 TARGET = $(LIB_NAME).lib

 DIROBJ = $(CFG)

 LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)

-CC     = $(CCNODBG) $(CFLAGSLIB)

+CC     = $(CCNODBG) $(RTLIB) $(CFLAGSLIB)

 CFGSET = TRUE

 !ENDIF

 

+##############################################################

+# Runtime library configuration

+

+RTLIB   = /MD

+RTLIBD  = /MDd

+

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

+RTLIB  = /MT

+RTLIBD = /MTd

+!ENDIF

+

+

 ######################

 # release-zlib

 

@@ -112,7 +135,7 @@ TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)

 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCNODBG) $(CFLAGSZLIB) $(CFLAGSLIB)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -122,7 +145,7 @@ CFGSET   = TRUE
 !IF "$(CFG)" == "release-dll"

 TARGET = $(LIB_NAME).dll

 DIROBJ = $(CFG)

-LNK    = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib

+LNK    = $(LNKDLL) $(RTLIB) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib

 CC     = $(CCNODBG)

 CFGSET = TRUE

 RESOURCE = $(DIROBJ)\libcurl.res

@@ -136,7 +159,7 @@ TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSLIB)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -148,7 +171,7 @@ TARGET   = $(LIB_NAME).dll
 DIROBJ   = $(CFG)

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

 LNK      = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) $(SSLLIBS) $(LFLAGSSSL) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib

-CC       = $(CCNODBG) $(CFLAGSSSL)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)

 CFGSET   = TRUE

 !ENDIF

 

@@ -161,7 +184,7 @@ DIROBJ   = $(CFG)
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -173,7 +196,7 @@ TARGET   = $(LIB_NAME).dll
 DIROBJ   = $(CFG)

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib

-CC       = $(CCNODBG) $(CFLAGSSSL)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)

 CFGSET   = TRUE

 RESOURCE = $(DIROBJ)\libcurl.res

 !ENDIF

@@ -186,7 +209,7 @@ TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)

 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCNODBG) $(CFLAGSZLIB) $(CFLAGSLIB)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -199,7 +222,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -211,7 +234,7 @@ TARGET   = $(LIB_NAME).dll
 DIROBJ   = $(CFG)

 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib

-CC       = $(CCNODBG) $(CFLAGSZLIB)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB)

 CFGSET   = TRUE

 RESOURCE = $(DIROBJ)\libcurl.res

 !ENDIF

@@ -225,7 +248,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib

-CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB)

 CFGSET   = TRUE

 RESOURCE = $(DIROBJ)\libcurl.res

 !ENDIF

@@ -237,7 +260,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 TARGET = $(LIB_NAME_DEBUG).lib

 DIROBJ = $(CFG)

 LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)

-CC     = $(CCDEBUG) $(CFLAGSLIB)

+CC     = $(CCDEBUG) $(RTLIBD) $(CFLAGSLIB)

 CFGSET = TRUE

 !ENDIF

 

@@ -249,7 +272,7 @@ TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

 LNK      = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSLIB)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -261,7 +284,7 @@ TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)

 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCDEBUG) $(CFLAGSZLIB) $(CFLAGSLIB)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -273,7 +296,7 @@ TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)

 LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)\out32dll

 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSLIB)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -286,7 +309,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

 LNK      = $(LNKLIB) $(SSLLIBS) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -298,7 +321,7 @@ TARGET   = $(LIB_NAME_DEBUG).lib
 DIROBJ   = $(CFG)

 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCDEBUG) $(CFLAGSZLIB) $(CFLAGSLIB)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -311,7 +334,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

 CFGSET   = TRUE

 !ENDIF

 

@@ -322,7 +345,7 @@ CFGSET   = TRUE
 TARGET = $(LIB_NAME_DEBUG).dll

 DIROBJ = $(CFG)

 LNK    = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

-CC     = $(CCDEBUG)

+CC     = $(CCDEBUG) $(RTLIBD) 

 CFGSET = TRUE

 RESOURCE = $(DIROBJ)\libcurl.res

 !ENDIF

@@ -335,7 +358,7 @@ TARGET   = $(LIB_NAME_DEBUG).dll
 DIROBJ   = $(CFG)

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

-CC       = $(CCDEBUG) $(CFLAGSSSL)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL)

 CFGSET   = TRUE

 RESOURCE = $(DIROBJ)\libcurl.res

 !ENDIF

@@ -348,7 +371,7 @@ TARGET   = $(LIB_NAME_DEBUG).dll
 DIROBJ   = $(CFG)

 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

-CC       = $(CCDEBUG) $(CFLAGSZLIB)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB)

 CFGSET   = TRUE

 RESOURCE = $(DIROBJ)\libcurl.res

 !ENDIF

@@ -362,7 +385,7 @@ DIROBJ   = $(CFG)
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"

 LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

-CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB)

+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB)

 CFGSET   = TRUE

 RESOURCE = $(DIROBJ)\libcurl.res

 !ENDIF