Commit 8d16b2b1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

winsock 2 fixes

parent 4d2cb8b3

lib/Makefile.m32

+2 −3
Original line number Diff line number Diff line 
#############################################################

# $Id$

#

## Makefile for building libcurl.a with MingW32 (GCC-2.95) and

## optionally OpenSSL (0.9.6)
@@ -12,7 +11,7 @@ CC = gcc 
AR = ar

RANLIB = ranlib

STRIP = strip -g

OPENSSL_PATH = ../../openssl-0.9.6

OPENSSL_PATH = ../../openssl-0.9.6b



########################################################

## Nothing more to do below this line!
@@ -62,7 +61,7 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES) 


libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o

	-@erase $@

	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32

	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32 -lws2_32

	$(STRIP) $@



# remove the last line above to keep debug info

src/Makefile.m32

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


CC = gcc

STRIP = strip -s

OPENSSL_PATH = ../../openssl-0.9.6

OPENSSL_PATH = ../../openssl-0.9.6b



# We may need these someday

# PERL = perl
@@ -36,7 +36,7 @@ else 
  curl_DEPENDENCIES = ../lib/libcurl.a

  curl_LDADD = -L../lib -lcurl

endif

curl_LDADD += -lwsock32

curl_LDADD += -lwsock32 -lws2_32

ifdef SSL

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

endif