diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-09 23:53:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-09 23:53:09 +0300 |
| commit | ff75e6c99c291e0cf6d0e7f70e13f78e4606e5a8 (patch) | |
| tree | 6c1256a43f2c1a983586966ba4de30d3ced91bf5 /contrib/buildsystems | |
| parent | 0df670bc0b8b5499859829ba0889ce96a75304a6 (diff) | |
| parent | e58e40556fc40cc39c018d98f7fcc09bdf3c398e (diff) | |
Merge branch 'os/vcbuild'
Fix build procedure for MSVC.
* os/vcbuild:
contrib/buildsystems: fix expat library name for generated vcxproj
vcbuild: fix batch file name in README
vcbuild: fix library name for expat with make MSVC=1
Diffstat (limited to 'contrib/buildsystems')
| -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 5c666f9ac0..d2584450ba 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 070978506a..2ff9620459 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 =~ /^[-\/]/) { |