Skip to content

Commit e58e405

Browse files
orgadsgitster
authored andcommitted
contrib/buildsystems: fix expat library name for generated vcxproj
expat.lib -> libexpat.lib (libexpatd.lib for debug build). Signed-off-by: Orgad Shaneh <[email protected]> Acked-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3384a1e commit e58e405

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

contrib/buildsystems/Generators/Vcxproj.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ sub createProject {
8080
$libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
8181
$libs_debug = $libs_release;
8282
$libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
83+
$libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;
8384
$libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
8485
}
8586

contrib/buildsystems/engine.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ sub handleLinkLine
349349
} elsif ("$part" eq "-lcurl") {
350350
push(@libs, "libcurl.lib");
351351
} elsif ("$part" eq "-lexpat") {
352-
push(@libs, "expat.lib");
352+
push(@libs, "libexpat.lib");
353353
} elsif ("$part" eq "-liconv") {
354354
push(@libs, "libiconv.lib");
355355
} elsif ($part =~ /^[-\/]/) {

0 commit comments

Comments
 (0)