diff options
| author | Orgad Shaneh <orgads@gmail.com> | 2020-09-07 06:00:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-08 21:50:00 (GMT) |
| commit | e58e40556fc40cc39c018d98f7fcc09bdf3c398e (patch) | |
| tree | ddd552ab649d8c1303b1a3ffea20507973fac658 | |
| parent | 3384a1ef78cae095d527d106cc15ca13b075c05f (diff) | |
| download | git-e58e40556fc40cc39c018d98f7fcc09bdf3c398e.zip git-e58e40556fc40cc39c018d98f7fcc09bdf3c398e.tar.gz git-e58e40556fc40cc39c018d98f7fcc09bdf3c398e.tar.bz2 | |
contrib/buildsystems: fix expat library name for generated vcxproj
expat.lib -> libexpat.lib (libexpatd.lib for debug build).
Signed-off-by: Orgad Shaneh <orgads@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | contrib/buildsystems/Generators/Vcxproj.pm | 1 | ||||
| -rwxr-xr-x | contrib/buildsystems/engine.pl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm index 5c666f9..d258445 100644 --- a/contrib/buildsystems/Generators/Vcxproj.pm +++ b/contrib/buildsystems/Generators/Vcxproj.pm @@ -80,6 +80,7 @@ sub createProject { $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}})); $libs_debug = $libs_release; $libs_debug =~ s/zlib\.lib/zlibd\.lib/g; + $libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g; $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g; } diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 0709785..2ff9620 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -349,7 +349,7 @@ sub handleLinkLine } elsif ("$part" eq "-lcurl") { push(@libs, "libcurl.lib"); } elsif ("$part" eq "-lexpat") { - push(@libs, "expat.lib"); + push(@libs, "libexpat.lib"); } elsif ("$part" eq "-liconv") { push(@libs, "libiconv.lib"); } elsif ($part =~ /^[-\/]/) { |