Jörn fixes for 7.9.8 build

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 8ba0fedb034a857d58d1eeb3446f03e1e126a66f..8f0d9402f342bd2cd33549c85c476a0c1bb04f4d 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -61,7 +61,7 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
 \r
 libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o\r
        -@erase $@\r
-       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\r
+       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\r
        $(STRIP) $@\r
 \r
 # remove the last line above to keep debug info\r

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index aadf4246d1eb404abb4da56bc15ae6f088ce74ca..57d24d4fc18a9d76472a2d7ccbbfeff524cc873a 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -11,7 +11,7 @@
 \r
 CC = gcc\r
 STRIP = strip -s\r
-OPENSSL_PATH = ../../openssl-0.9.6b\r
+OPENSSL_PATH = ../../openssl-0.9.6d\r
 \r
 # We may need these someday\r
 # PERL = perl\r
@@ -36,7 +36,7 @@ else
   curl_DEPENDENCIES = ../lib/libcurl.a\r
   curl_LDADD = -L../lib -lcurl\r
 endif\r
-curl_LDADD += -lwsock32 -lws2_32\r
+curl_LDADD += -lwsock32 -lws2_32 -lwinmm\r
 ifdef SSL\r
   curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue\r
 endif\r