moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

winsock 2 fixes

This commit is contained in:
Daniel Stenberg 2001-09-25 07:55:19 +00:00
parent 4d2cb8b32a
commit 8d16b2b119
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Makefile.m32
View File

@ -1,5 +1,4 @@
############################################################# #############################################################
# $Id$
# #
## Makefile for building libcurl.a with MingW32 (GCC-2.95) and ## Makefile for building libcurl.a with MingW32 (GCC-2.95) and
## optionally OpenSSL (0.9.6) ## optionally OpenSSL (0.9.6)
@ -12,7 +11,7 @@ CC = gcc
AR = ar AR = ar
RANLIB = ranlib RANLIB = ranlib
STRIP = strip -g STRIP = strip -g
OPENSSL_PATH = ../../openssl-0.9.6 OPENSSL_PATH = ../../openssl-0.9.6b
######################################################## ########################################################
## Nothing more to do below this line! ## 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 libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o
-@erase $@ -@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) $@ $(STRIP) $@
# remove the last line above to keep debug info # remove the last line above to keep debug info

4
src/Makefile.m32
View File

@ -11,7 +11,7 @@
CC = gcc CC = gcc
STRIP = strip -s STRIP = strip -s
OPENSSL_PATH = ../../openssl-0.9.6 OPENSSL_PATH = ../../openssl-0.9.6b
# We may need these someday # We may need these someday
# PERL = perl # PERL = perl
@ -36,7 +36,7 @@ else
curl_DEPENDENCIES = ../lib/libcurl.a curl_DEPENDENCIES = ../lib/libcurl.a
curl_LDADD = -L../lib -lcurl curl_LDADD = -L../lib -lcurl
endif endif
curl_LDADD += -lwsock32 curl_LDADD += -lwsock32 -lws2_32
ifdef SSL ifdef SSL
curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue
endif endif