summaryrefslogtreecommitdiff
path: root/contrib/buildsystems
diff options
context:
space:
mode:
authorMarius Storm-Olsen <mstormo@gmail.com>2009-10-21 17:04:51 (GMT)
committerJohannes Sixt <j6t@kdbg.org>2009-10-23 10:48:04 (GMT)
commitc36e16385be363a11abaa4a43edd5a2b2b2dff81 (patch)
tree0ccfb71de3758e08e3bde992f1cffcdee89c673e /contrib/buildsystems
parent4192e1cd02365c63f1155fc547e4ef2163050c59 (diff)
downloadgit-c36e16385be363a11abaa4a43edd5a2b2b2dff81.zip
git-c36e16385be363a11abaa4a43edd5a2b2b2dff81.tar.gz
git-c36e16385be363a11abaa4a43edd5a2b2b2dff81.tar.bz2
MSVC: Enable OpenSSL, and translate -lcrypto
We don't use crypto, but rather require libeay32 and ssleay32. handle it in both the Makefile msvc linker script, and the buildsystem generator. Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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)$/) {