aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile.m322
-rw-r--r--src/Makefile.m324
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