--- Makefile.vc6.orig 2005-04-19 17:26:51.670375000 -0500 +++ Makefile.vc6 2005-04-19 17:30:23.951625000 -0500 @@ -72,6 +72,7 @@ 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 +CFLAGSLIB = /DCURL_STATICLIB LNKDLL = link.exe /DLL LNKLIB = link.exe /lib LFLAGS = /nologo @@ -99,7 +100,7 @@ TARGET = $(LIB_NAME).lib DIROBJ = $(CFG) LNK = $(LNKLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCNODBG) +CC = $(CCNODBG) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -111,7 +112,7 @@ DIROBJ = $(CFG) LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)" LNK = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCNODBG) $(CFLAGSZLIB) +CC = $(CCNODBG) $(CFLAGSZLIB) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -135,7 +136,7 @@ DIROBJ = $(CFG) LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32" LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) -CC = $(CCNODBG) $(CFLAGSSSL) +CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -160,7 +161,7 @@ LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32" LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)" LNK = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) +CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -185,7 +186,7 @@ DIROBJ = $(CFG) LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)" LNK = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCNODBG) $(CFLAGSZLIB) +CC = $(CCNODBG) $(CFLAGSZLIB) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -198,7 +199,7 @@ LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)" LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll" LNK = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) +CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -236,7 +237,7 @@ TARGET = $(LIB_NAME_DEBUG).lib DIROBJ = $(CFG) LNK = $(LNKLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCDEBUG) +CC = $(CCDEBUG) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -248,7 +249,7 @@ DIROBJ = $(CFG) LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32" LNK = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) -CC = $(CCDEBUG) $(CFLAGSSSL) +CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -260,7 +261,7 @@ DIROBJ = $(CFG) LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)" LNK = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCDEBUG) $(CFLAGSZLIB) +CC = $(CCDEBUG) $(CFLAGSZLIB) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -272,7 +273,7 @@ DIROBJ = $(CFG) LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)\out32dll LNK = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) -CC = $(CCDEBUG) $(CFLAGSSSL) +CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -285,7 +286,7 @@ LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)" LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32" LNK = $(LNKLIB) $(SSLLIBS) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) +CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -297,7 +298,7 @@ DIROBJ = $(CFG) LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)" LNK = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCDEBUG) $(CFLAGSZLIB) +CC = $(CCDEBUG) $(CFLAGSZLIB) $(CFLAGSLIB) CFGSET = TRUE !ENDIF @@ -310,7 +311,7 @@ LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)" LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll" LNK = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) -CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) +CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB) CFGSET = TRUE !ENDIF