summaryrefslogtreecommitdiff
path: root/contrib/buildsystems
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-18 06:03:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-18 06:03:00 (GMT)
commita62e733be6abf88f76bdcb6c5eeef34f43860c8c (patch)
tree587698bd79f0316272771eb3c75ed4e73ba3b07e /contrib/buildsystems
parent643faeea5fdfd8d7c0a6084fd26651f340521483 (diff)
parent9bccfcdbff3b11e11a69d05c50c8bc1a9a6dbb5f (diff)
downloadgit-a62e733be6abf88f76bdcb6c5eeef34f43860c8c.zip
git-a62e733be6abf88f76bdcb6c5eeef34f43860c8c.tar.gz
git-a62e733be6abf88f76bdcb6c5eeef34f43860c8c.tar.bz2
Merge branch 'ef/msys-imap'
* ef/msys-imap: Windows: use BLK_SHA1 again MSVC: Enable OpenSSL, and translate -lcrypto mingw: enable OpenSSL mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle imap-send: build imap-send on Windows imap-send: fix compilation-error on Windows imap-send: use run-command API for tunneling imap-send: use separate read and write fds imap-send: remove useless uid code
Diffstat (limited to 'contrib/buildsystems')
-rw-r--r--contrib/buildsystems/engine.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 20bd061..d506717 100644
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -315,6 +315,9 @@ sub handleLinkLine
$appout = shift @parts;
} elsif ("$part" eq "-lz") {
push(@libs, "zlib.lib");
+ } elsif ("$part" eq "-lcrypto") {
+ push(@libs, "libeay32.lib");
+ push(@libs, "ssleay32.lib");
} elsif ($part =~ /^-/) {
push(@lflags, $part);
} elsif ($part =~ /\.(a|lib)$/) {