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>
Marius Storm-Olsen committed
Oct 21, 2009 at 19:04 UTC
c36e16385be363a11abaa4a43edd5a2b2b2dff81
3 files changed
+7
-1
Makefile
+1
-1
@@ -881,7 +881,7 @@ ifdef MSVC
881
GIT_VERSION := $(GIT_VERSION).MSVC
882
pathsep = ;
883
NO_PREAD = YesPlease
884
- NO_OPENSSL = YesPlease
884
+ NEEDS_CRYPTO_WITH_SSL = YesPlease
885
NO_LIBGEN_H = YesPlease
886
NO_SYMLINK_HEAD = YesPlease
887
NO_IPV6 = YesPlease
compat/vcbuild/scripts/clink.pl
+3
@@ -29,6 +29,9 @@ while (@ARGV) {
29
push(@args, "zlib.lib");
30
} elsif ("$arg" eq "-liconv") {
31
push(@args, "iconv.lib");
32
+ } elsif ("$arg" eq "-lcrypto") {
33
+ push(@args, "libeay32.lib");
34
+ push(@args, "ssleay32.lib");
35
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
36
$arg =~ s/^-L/-LIBPATH:/;
37
push(@args, $arg);
contrib/buildsystems/engine.pl
+3
@@ -315,6 +315,9 @@ sub handleLinkLine
315
$appout = shift @parts;
316
} elsif ("$part" eq "-lz") {
317
push(@libs, "zlib.lib");
318
+ } elsif ("$part" eq "-lcrypto") {
319
+ push(@libs, "libeay32.lib");
320
+ push(@libs, "ssleay32.lib");
321
} elsif ($part =~ /^-/) {
322
push(@lflags, $part);
323
} elsif ($part =~ /\.(a|lib)$/) {