Skip to content

Commit

Permalink
Merge pull request #2476 from dscho/vcpkg-upgraded-to-openssl-v1.1.x
Browse files Browse the repository at this point in the history
Accommodate for vcpkg's upgrade to OpenSSL v1.1.x
  • Loading branch information
dscho committed Jan 15, 2020
2 parents 7c71c85 + 96d3d53 commit f92c7e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions compat/vcbuild/scripts/clink.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions contrib/buildsystems/engine.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down

0 comments on commit f92c7e0

Please sign in to comment.