From 5af61716aaf4968abfc27d5feaaa7d1d9a27d590 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 23 Mar 2002 15:41:17 +0000 Subject: Miklos Nemeth's update --- lib/Makefile.vc6 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 1febf4029..f46749ee6 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -47,7 +47,6 @@ CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB LNKDLL = link.exe /DLL /def:libcurl.def LNKLIB = link.exe -lib LFLAGS = /nologo -LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll LINKLIBS = ws2_32.lib SSLLIBS = libeay32.lib ssleay32.lib RSAglue.lib CFGSET = FALSE @@ -80,8 +79,9 @@ CFGSET = TRUE !IF "$(CFG)" == "release-ssl" TARGET =$(LIB_NAME).lib DIROBJ =.\$(CFG) +LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32" LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET) -LINKLIBS = $(LINKLIBS) $(SSLLIBS) +LINKLIBS = $(LINKLIBS) CC = $(CCNODBG) $(CFLAGSSSL) CFGSET = TRUE !ENDIF @@ -92,15 +92,13 @@ CFGSET = TRUE !IF "$(CFG)" == "release-ssl-dll" TARGET =$(LIB_NAME).dll DIROBJ =.\$(CFG) +LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll" LNK = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" LINKLIBS = $(LINKLIBS) $(SSLLIBS) CC = $(CCNODBG) $(CFLAGSSSL) CFGSET = TRUE !ENDIF - - - ###################### # debug @@ -130,7 +128,7 @@ CFGSET = TRUE TARGET = $(LIB_NAME_DEBUG).lib DIROBJ =.\$(CFG) LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET) -LINKLIBS = $(LINKLIBS) $(SSLLIBS) +LINKLIBS = $(LINKLIBS) CC = $(CCDEBUG) $(CFLAGSSSL) CFGSET = TRUE !ENDIF -- cgit v1.2.3