diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:31:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:31:07 -0700 |
| commit | 8456113de56a1d1407703b1d4d8e789a54b987c9 (patch) | |
| tree | bf6c06a82a62d420c1ad1d0ab2c0b5dc8888a07b | |
| parent | 24b9cb100214adb0c5ebe574924c3acf6c61f214 (diff) | |
| parent | da8daa367b7dfe4337252810f6be0c0c31aa93c2 (diff) | |
| download | git-8456113de56a1d1407703b1d4d8e789a54b987c9.tar.gz | |
Merge branch 'mr/msvc-link-with-lcurl'
* mr/msvc-link-with-lcurl:
MSVC: allow linking with the cURL library
| -rwxr-xr-x | compat/vcbuild/scripts/clink.pl | 2 | ||||
| -rw-r--r-- | config.mak.uname | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl index 4374771df2..a87d0da512 100755 --- a/compat/vcbuild/scripts/clink.pl +++ b/compat/vcbuild/scripts/clink.pl @@ -33,6 +33,8 @@ while (@ARGV) { push(@args, "libeay32.lib"); } elsif ("$arg" eq "-lssl") { push(@args, "ssleay32.lib"); + } elsif ("$arg" eq "-lcurl") { + push(@args, "libcurl.lib"); } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") { $arg =~ s/^-L/-LIBPATH:/; push(@args, $arg); diff --git a/config.mak.uname b/config.mak.uname index 6069a44350..cfc2a9323f 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -340,7 +340,6 @@ ifeq ($(uname_S),Windows) UNRELIABLE_FSTAT = UnfortunatelyYes OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo NO_REGEX = YesPlease - NO_CURL = YesPlease NO_GETTEXT = YesPlease NO_PYTHON = YesPlease BLK_SHA1 = YesPlease |