Commit 5af61716 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Miklos Nemeth's update

parent 6f3e0051

lib/Makefile.vc6

+4 −6
Original line number Diff line number Diff line
@@ -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

src/Makefile.vc6

+14 −0
Original line number Diff line number Diff line
@@ -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)