git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-07-06 21:12:15 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge pull request #2264 from dscho/fix-vs-build

Browse Source 
Two fixes for the `visual-studio` patches
This commit is contained in:
Johannes Schindelin
2019-07-30 09:11:48 +02:00
committed by GitHub
parent ddd892d6a1 0b1375180b
commit eafc02c9be
2 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
.gitignore vendored
View File

@@ -186,42 +186,6 @@
/gitweb/static/gitweb.js
/gitweb/static/gitweb.min.*
/command-list.h
/libgit
/test-chmtime
/test-ctype
/test-config
/test-date
/test-delta
/test-dump-cache-tree
/test-dump-split-index
/test-dump-untracked-cache
/test-fake-ssh
/test-scrap-cache-tree
/test-genrandom
/test-hashmap
/test-index-version
/test-line-buffer
/test-match-trees
/test-mergesort
/test-mktemp
/test-parse-options
/test-path-utils
/test-prio-queue
/test-read-cache
/test-regex
/test-revision-walking
/test-run-command
/test-sha1
/test-sha1-array
/test-sigchain
/test-string-list
/test-submodule-config
/test-subprocess
/test-svn-fe
/test-urlmatch-normalization
/test-wildmatch
/vcs-svn_lib
/xdiff_lib
*.tar.gz
*.dsc
*.deb

6
contrib/buildsystems/Generators/Vcxproj.pm
View File

@@ -228,7 +228,7 @@ EOM
print F << "EOM";
</ItemGroup>
EOM
if (!$static_library || $target =~ 'vcs-svn') {
if (!$static_library || $target =~ 'vcs-svn' || $target =~ 'xdiff') {
my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"};
my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};
@@ -238,11 +238,15 @@ EOM
<Project>$uuid_libgit</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
EOM
if (!($name =~ 'xdiff')) {
print F << "EOM";
<ProjectReference Include="$cdup\\xdiff\\lib\\xdiff_lib.vcxproj">
<Project>$uuid_xdiff_lib</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
EOM
}
if ($name =~ /(test-(line-buffer|svn-fe)|^git-remote-testsvn)\.exe$/) {
my $uuid_vcs_svn_lib = $$build_structure{"LIBS_vcs-svn/lib_GUID"};
print F << "EOM";