Miklos Nemeth's update

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 1febf402956619ba5f433d90f4806c1112e710f9..f46749ee6d7cade3e2af06895178df43f5b78dd0 100644 (file)
--- 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\r
 LNKLIB    = link.exe -lib\r
 LFLAGS    = /nologo\r
-LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll\r
 LINKLIBS  = ws2_32.lib\r
 SSLLIBS   = libeay32.lib ssleay32.lib RSAglue.lib\r
 CFGSET    = FALSE\r
@@ -80,8 +79,9 @@ CFGSET = TRUE
 !IF "$(CFG)" == "release-ssl"\r
 TARGET   =$(LIB_NAME).lib\r
 DIROBJ   =.\$(CFG)\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)\r
-LINKLIBS = $(LINKLIBS) $(SSLLIBS)\r
+LINKLIBS = $(LINKLIBS)\r
 CC       = $(CCNODBG) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 !ENDIF\r
@@ -92,15 +92,13 @@ CFGSET   = TRUE
 !IF "$(CFG)" == "release-ssl-dll"\r
 TARGET   =$(LIB_NAME).dll\r
 DIROBJ   =.\$(CFG)\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"\r
 LNK      = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"\r
 LINKLIBS = $(LINKLIBS) $(SSLLIBS)\r
 CC       = $(CCNODBG)  $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
-\r
-\r
-\r
 ######################\r
 # debug\r
 \r
@@ -130,7 +128,7 @@ CFGSET = TRUE
 TARGET   = $(LIB_NAME_DEBUG).lib\r
 DIROBJ   =.\$(CFG)\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)\r
-LINKLIBS = $(LINKLIBS) $(SSLLIBS)\r
+LINKLIBS = $(LINKLIBS)\r
 CC       = $(CCDEBUG) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 !ENDIF\r

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 5b5be7a3ef0d1d6e314f5b121505597f87bfbbce..4b94c5e8250cd24df46741150d2c5dcdf3d3faf4 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -45,6 +45,20 @@ LINK_OBJS= \
        urlglob.obj \\r
        main.obj\r
 \r
+ \r
+######################\r
+# release-ssl\r
+ \r
+!IF "$(CFG)" == "release-ssl"\r
+!IFNDEF OPENSSL_PATH\r
+OPENSSL_PATH   = ../../openssl-0.9.6\r
+!ENDIF\r
+LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
+SSLLIBS   = libeay32.lib ssleay32.lib RSAglue.lib gdi32.lib \r
+LINKLIBS  = $(LINKLIBS) $(SSLLIBS)\r
+LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
+!ENDIF\r
+ \r
 all : release\r
 \r
 release: $(RELEASE_OBJS)\r