From 8ce10b5dfa60581845a8d2c2727ef475e5dfc3cd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 12 Jun 2002 09:18:37 +0000 Subject: [PATCH] =?UTF-8?q?J=F6rn=20fixes=20for=207.9.8=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/Makefile.m32 | 2 +- src/Makefile.m32 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 8ba0fedb0..8f0d9402f 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -61,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 -lws2_32 + 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 -lwinmm $(STRIP) $@ # remove the last line above to keep debug info diff --git a/src/Makefile.m32 b/src/Makefile.m32 index aadf4246d..57d24d4fc 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -11,7 +11,7 @@ CC = gcc STRIP = strip -s -OPENSSL_PATH = ../../openssl-0.9.6b +OPENSSL_PATH = ../../openssl-0.9.6d # 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 -lws2_32 +curl_LDADD += -lwsock32 -lws2_32 -lwinmm ifdef SSL curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue endif