diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-06-12 09:18:37 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-06-12 09:18:37 +0000 |
| commit | 8ce10b5dfa60581845a8d2c2727ef475e5dfc3cd (patch) | |
| tree | 568be181961304d399804c6c08df859ace9cf3d6 | |
| parent | 943e31b35ce1afa62746d321d6a05763f0aa2a51 (diff) | |
Jörn fixes for 7.9.8 build
| -rw-r--r-- | lib/Makefile.m32 | 2 | ||||
| -rw-r--r-- | 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
|