Dave Dribin: set CURL_STATICLIB when it builds static library variants.

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 7c6813e5d89992af0c1d5a9e600eac234d226e58..adb6a4815e54010d03dd3e35da8c15666a480622 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -72,6 +72,7 @@ CCDEBUG    = cl.exe /MDd /Od /Gm /Zi /D_DEBUG /GZ
 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
+CFLAGSLIB  = /DCURL_STATICLIB\r
 LNKDLL     = link.exe /DLL\r
 LNKLIB     = link.exe /lib\r
 LFLAGS     = /nologo\r
@@ -99,7 +100,7 @@ LFLAGS = $(LFLAGS) $(WINDOWS_SDK_PATH)\lib\secur32.lib
 TARGET = $(LIB_NAME).lib\r
 DIROBJ = $(CFG)\r
 LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC     = $(CCNODBG)\r
+CC     = $(CCNODBG) $(CFLAGSLIB)\r
 CFGSET = TRUE\r
 !ENDIF\r
 \r
@@ -111,7 +112,7 @@ TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(CFLAGSZLIB)\r
+CC       = $(CCNODBG) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -135,7 +136,7 @@ TARGET   = $(LIB_NAME).lib
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(CFLAGSSSL)\r
+CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -160,7 +161,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)\r
+CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -185,7 +186,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)\r
+CC       = $(CCNODBG) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -198,7 +199,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)\r
+CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -236,7 +237,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 TARGET = $(LIB_NAME_DEBUG).lib\r
 DIROBJ = $(CFG)\r
 LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC     = $(CCDEBUG)\r
+CC     = $(CCDEBUG) $(CFLAGSLIB)\r
 CFGSET = TRUE\r
 !ENDIF\r
 \r
@@ -248,7 +249,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)\r
+CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -260,7 +261,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)\r
+CC       = $(CCDEBUG) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -272,7 +273,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)\r
+CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -285,7 +286,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)\r
+CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -297,7 +298,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)\r
+CC       = $(CCDEBUG) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
@@ -310,7 +311,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)\r
+CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r