mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-10 19:16:14 +02:00
Code

Merge branch 'mr/msvc-link-with-lcurl' 

* mr/msvc-link-with-lcurl:
  MSVC: allow linking with the cURL library
This commit is contained in:
Junio C Hamano 2014-03-31 16:31:07 -07:00
parent 24b9cb1002 da8daa367b
commit 8456113de5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compat/vcbuild/scripts/clink.pl
View File

@ -33,6 +33,8 @@
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);

1
config.mak.uname
View File

@ -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