contrib/buildsystems: fix expat library name for generated vcxproj

orgads · gitster · commit e58e40556fc4 · 2020-09-08T14:50:00.000-07:00
expat.lib -&gt; libexpat.lib (libexpatd.lib for debug build).

Signed-off-by: Orgad Shaneh &lt;orgads@gmail.com&gt;
Acked-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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 =~ /^[-\/]/) {

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ sub createProject {`
`80`	`80`	`$libs_release = join(";", sort(grep /^(?!libgit\.lib\|xdiff\/lib\.lib\|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));`
`81`	`81`	`$libs_debug = $libs_release;`
`82`	`82`	`$libs_debug =~ s/zlib\.lib/zlibd\.lib/g;`
	`83`	`+ $libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;`
`83`	`84`	`$libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;`
`84`	`85`	`}`
`85`	`86`