diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-09 20:53:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-09 20:53:09 (GMT) |
| commit | ff75e6c99c291e0cf6d0e7f70e13f78e4606e5a8 (patch) | |
| tree | 6c1256a43f2c1a983586966ba4de30d3ced91bf5 /compat | |
| parent | 0df670bc0b8b5499859829ba0889ce96a75304a6 (diff) | |
| parent | e58e40556fc40cc39c018d98f7fcc09bdf3c398e (diff) | |
| download | git-ff75e6c99c291e0cf6d0e7f70e13f78e4606e5a8.zip git-ff75e6c99c291e0cf6d0e7f70e13f78e4606e5a8.tar.gz git-ff75e6c99c291e0cf6d0e7f70e13f78e4606e5a8.tar.bz2 | |
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 'compat')
| -rw-r--r-- | compat/vcbuild/README | 4 | ||||
| -rwxr-xr-x | compat/vcbuild/scripts/clink.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compat/vcbuild/README b/compat/vcbuild/README index 42292e7..51fb083 100644 --- a/compat/vcbuild/README +++ b/compat/vcbuild/README @@ -26,8 +26,8 @@ The Steps to Build Git with VS2015 or VS2017 from the command line. Use ONE of the following forms which should match how you want to compile git.exe. - $ ./compat/vcbuild/vcpkg_copy_packages.bat debug - $ ./compat/vcbuild/vcpkg_copy_packages.bat release + $ ./compat/vcbuild/vcpkg_copy_dlls.bat debug + $ ./compat/vcbuild/vcpkg_copy_dlls.bat release 3. Build git using MSVC from an SDK bash window using one of the following commands: diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl index 61ad084..df167d1 100755 --- a/compat/vcbuild/scripts/clink.pl +++ b/compat/vcbuild/scripts/clink.pl @@ -66,7 +66,7 @@ while (@ARGV) { } push(@args, $lib); } elsif ("$arg" eq "-lexpat") { - push(@args, "expat.lib"); + push(@args, "libexpat.lib"); } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") { $arg =~ s/^-L/-LIBPATH:/; push(@lflags, $arg); |