Commit 0a1a1858 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Andres Garcia Garcia updated to build with the most recent OpenSSL and 

the recent libcurl changes.
parent 8f809e2a

lib/Makefile.m32

+5 −5
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ AR = ar 
RM = rm -f 

RANLIB = ranlib

STRIP = strip -g

OPENSSL_PATH = ../../openssl-0.9.6g

OPENSSL_PATH = ../../openssl-0.9.7a

ZLIB_PATH = ../../zlib-1.1.4



########################################################
@@ -22,8 +22,8 @@ INCLUDES = -I. -I.. -I../include -I../src 
CFLAGS = -g -O2 -DMINGW32

ifdef SSL

  INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"

  CFLAGS += -DUSE_SSLEAY

  DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue

  CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H

  DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32

endif

ifdef ZLIB

	INCLUDES += -I"$(ZLIB_PATH)"
@@ -42,7 +42,7 @@ libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \ 
	ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c	\

	telnet.h getinfo.c strequal.c strequal.h easy.c security.h		\

	security.c krb4.h krb4.c memdebug.h memdebug.c inet_ntoa_r.h http_chunks.h http_chunks.c \

	strtok.c connect.c hash.c llist.c multi.c \

	strtok.c connect.c hash.c llist.c multi.c share.c share.h\

	content_encoding.h content_encoding.c



libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
@@ -50,7 +50,7 @@ libcurl_a_OBJECTS = file.o timeval.o base64.o hostip.o progress.o \ 
	speedcheck.o getdate.o transfer.o ldap.o ssluse.o version.o \

	getenv.o escape.o mprintf.o telnet.o getpass.o netrc.o getinfo.o \

	strequal.o easy.o security.o krb4.o memdebug.o http_chunks.o \

	strtok.o connect.o hash.o llist.o multi.o \

	strtok.o connect.o hash.o llist.o multi.o share.o \

	content_encoding.o



LIBRARIES =  $(libcurl_a_LIBRARIES)

src/Makefile.m32

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
CC = gcc

RM = rm -f

STRIP = strip -s

OPENSSL_PATH = ../../openssl-0.9.6g

OPENSSL_PATH = ../../openssl-0.9.7a

ZLIB_PATH = ../../zlib-1.1.4



# We may need these someday
@@ -25,7 +25,7 @@ ZLIB_PATH = ../../zlib-1.1.4 
INCLUDES = -I. -I.. -I../include

CFLAGS = -g -O2 -DMINGW32

ifdef SSL

  CFLAGS += -DUSE_SSLEAY

  CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H

endif

LDFLAGS = 

COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
@@ -43,7 +43,7 @@ else 
endif

curl_LDADD += -lwsock32 -lws2_32 -lwinmm

ifdef SSL

  curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue

  curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32

endif

ifdef ZLIB

  curl_LDADD += -L$(ZLIB_PATH) -lz
@@ -75,7 +75,7 @@ curl.exe: $(curl_OBJECTS) $(curl_DEPENDENCIES) 
	$(COMPILE) -c $<



clean:

	$(RM) $(curl_OBJECTS)

	$(RM) $(curl_OBJECTS) curl.exe



distrib: clean

	$(RM) $(curl_PROGRAMS)