Skip to content

Commit 8456113

Browse files
committed
Merge branch 'mr/msvc-link-with-lcurl'
* mr/msvc-link-with-lcurl: MSVC: allow linking with the cURL library
2 parents 24b9cb1 + da8daa3 commit 8456113

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

compat/vcbuild/scripts/clink.pl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
push(@args, "libeay32.lib");
3434
} elsif ("$arg" eq "-lssl") {
3535
push(@args, "ssleay32.lib");
36+
} elsif ("$arg" eq "-lcurl") {
37+
push(@args, "libcurl.lib");
3638
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
3739
$arg =~ s/^-L/-LIBPATH:/;
3840
push(@args, $arg);

config.mak.uname

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ ifeq ($(uname_S),Windows)
340340
UNRELIABLE_FSTAT = UnfortunatelyYes
341341
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
342342
NO_REGEX = YesPlease
343-
NO_CURL = YesPlease
344343
NO_GETTEXT = YesPlease
345344
NO_PYTHON = YesPlease
346345
BLK_SHA1 = YesPlease

0 commit comments

Comments
 (0)