diff options
| -rw-r--r-- | lib/Makefile.vc6 | 10 | ||||
| -rw-r--r-- | src/Makefile.vc6 | 14 |
2 files changed, 18 insertions, 6 deletions
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
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 5b5be7a3e..4b94c5e82 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -45,6 +45,20 @@ LINK_OBJS= \ urlglob.obj \
main.obj
+
+######################
+# release-ssl
+
+!IF "$(CFG)" == "release-ssl"
+!IFNDEF OPENSSL_PATH
+OPENSSL_PATH = ../../openssl-0.9.6
+!ENDIF
+LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
+SSLLIBS = libeay32.lib ssleay32.lib RSAglue.lib gdi32.lib
+LINKLIBS = $(LINKLIBS) $(SSLLIBS)
+LFLAGS = $(LFLAGS) $(LFLAGSSSL)
+!ENDIF
+
all : release
release: $(RELEASE_OBJS)
|