@matheusbsbs / matheus-bagliano / commits / e58e40556f
Fork 0

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>

Orgad Shaneh committed Sep 7, 2020 at 06:00 UTC e58e40556fc40cc39c018d98f7fcc09bdf3c398e
2 files changed +2 -1
contrib/buildsystems/Generators/Vcxproj.pm
+1
@@ -80,6 +80,7 @@ sub createProject {
80 $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
81 $libs_debug = $libs_release;
82 $libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
83 + $libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;
84 $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
85 }
86
contrib/buildsystems/engine.pl
+1 -1
@@ -349,7 +349,7 @@ sub handleLinkLine
349 } elsif ("$part" eq "-lcurl") {
350 push(@libs, "libcurl.lib");
351 } elsif ("$part" eq "-lexpat") {
352 - push(@libs, "expat.lib");
352 + push(@libs, "libexpat.lib");
353 } elsif ("$part" eq "-liconv") {
354 push(@libs, "libiconv.lib");
355 } elsif ($part =~ /^[-\/]/) {