msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x

With the upgrade, the library names changed from libeay32/ssleay32 to
libcrypto/libssl.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index ec95a3b2d035293d8058d91061d4852d9a45097d..d9f71b7cbb71676567930f327c1c0acf0b67641a 100755 (executable)
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -45,9 +45,9 @@ while (@ARGV) {
        } elsif ("$arg" eq "-liconv") {
                push(@args, "libiconv.lib");
        } elsif ("$arg" eq "-lcrypto") {
-               push(@args, "libeay32.lib");
+               push(@args, "libcrypto.lib");
        } elsif ("$arg" eq "-lssl") {
-               push(@args, "ssleay32.lib");
+               push(@args, "libssl.lib");
        } elsif ("$arg" eq "-lcurl") {
                my $lib = "";
                # Newer vcpkg definitions call this libcurl_imp.lib; Do we

diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index fba8a3f056a0e16591496f77a8b505ec01d01964..070978506ad533b82f72aed9bd4f4062ee88cc71 100755 (executable)
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -343,9 +343,9 @@ sub handleLinkLine
         } elsif ("$part" eq "-lz") {
             push(@libs, "zlib.lib");
         } elsif ("$part" eq "-lcrypto") {
-            push(@libs, "libeay32.lib");
+            push(@libs, "libcrypto.lib");
         } elsif ("$part" eq "-lssl") {
-            push(@libs, "ssleay32.lib");
+            push(@libs, "libssl.lib");
         } elsif ("$part" eq "-lcurl") {
             push(@libs, "libcurl.lib");
         } elsif ("$part" eq "-lexpat") {