summaryrefslogtreecommitdiff
path: root/compat/vcbuild
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 /compat/vcbuild
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 'compat/vcbuild')
-rw-r--r--compat/vcbuild/scripts/clink.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index 0ffd59f..fce1e24 100644
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -29,6 +29,9 @@ while (@ARGV) {
push(@args, "zlib.lib");
} elsif ("$arg" eq "-liconv") {
push(@args, "iconv.lib");
+ } elsif ("$arg" eq "-lcrypto") {
+ push(@args, "libeay32.lib");
+ push(@args, "ssleay32.lib");
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
$arg =~ s/^-L/-LIBPATH:/;
push(@args, $arg);