contrib/buildsystems: fix expat library name for generated vcxproj
PATCH 1/1 contrib/buildsystems: fix expat library name for generated vcxproj
From: Orgad Shaneh <[email protected]>
expat.lib -> libexpat.lib (libexpatd.lib for debug build).
---
contrib/buildsystems: fix expat library name for generated vcxproj
expat.lib -> libexpat.lib (libexpatd.lib for debug build).
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-728%2Forgads%2Fvcxproj-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-728/orgads/vcxproj-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/728
contrib/buildsystems/Generators/Vcxproj.pm | 1 + contrib/buildsystems/engine.pl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
contrib/buildsystems/Generators/Vcxproj.pm +1 -0
@@ -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; }
contrib/buildsystems/engine.pl +1 -1
@@ -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 =~ /^[-\/]/) {
base-commit: e19713638985533ce461db072b49112da5bd2042
Signature · 1 line
gitgitgadget
Hi Orgad,
Quoted 3 lines · Orgad Shaneh via GitGitGadget
From: Orgad Shaneh <[email protected]>
expat.lib -> libexpat.lib (libexpatd.lib for debug build).
Good point, I forgot to verify that this is also needed for vcxproj, not only for MSVC=1...
Thanks,
Dscho
Quoted 47 lines
Signed-off-by Orgad Shaneh <[email protected]>---
contrib/buildsystems: fix expat library name for generated vcxprojexpat.lib -> libexpat.lib (libexpatd.lib for debug build).
Signed-off-by Orgad Shaneh [email protected] [[email protected]]Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-728%2Forgads%2Fvcxproj-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-728/orgads/vcxproj-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/728contrib/buildsystems/Generators/Vcxproj.pm | 1 + contrib/buildsystems/engine.pl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)contrib/buildsystems/Generators/Vcxproj.pm +1
-0@@ -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; }contrib/buildsystems/engine.pl +1
-1@@ -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 =~ /^[-\/]/) {base-commit:
e19713638985533ce461db072b49112da5bd2042--
gitgitgadget