mirror of
https://github.com/curl/curl.git
synced 2025-01-30 14:22:33 +08:00
Jrn fixes for 7.9.8 build
This commit is contained in:
parent
943e31b35c
commit
8ce10b5dfa
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user