Skip to content
Permalink
Browse files
Merge pull request #2476 from dscho/vcpkg-upgraded-to-openssl-v1.1.x
Accommodate for vcpkg's upgrade to OpenSSL v1.1.x
  • Loading branch information
dscho committed Jan 15, 2020
2 parents 7c71c85 + 96d3d53 commit f92c7e03019a178596f3bcbda88c1dd3bdc2c299
Showing with 4 additions and 4 deletions.
  1. +2 −2 compat/vcbuild/scripts/clink.pl
  2. +2 −2 contrib/buildsystems/engine.pl
@@ -45,9 +45,9 @@
} 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
@@ -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") {

0 comments on commit f92c7e0

Please sign in to comment.