Skip to content
Permalink
Browse files

fixup! vcxproj: also link-or-copy builtins

The git/ directory should already exist when we write that .targets
file... and then we should also add it explicitly...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information...
dscho committed Dec 20, 2017
1 parent af5e32d commit 5f997af33c0e6723cde4ac9d8afc2fec6d08ed0b
Showing with 6 additions and 5 deletions.
  1. +6 −5 config.mak.uname
@@ -718,6 +718,11 @@ vcxproj:
git diff-files --quiet && \
git diff-index --cached --quiet HEAD --

# Make .vcxproj files and add them
unset QUIET_GEN QUIET_BUILT_IN; \
perl contrib/buildsystems/generate -g Vcxproj
git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj

# Generate the LinkOrCopyBuiltins.targets file
(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
@@ -731,11 +736,7 @@ vcxproj:
done && \
echo ' </Target>' && \
echo '</Project>') >git/LinkOrCopyBuiltins.targets

# Make .vcxproj files and add them
unset QUIET_GEN QUIET_BUILT_IN; \
perl contrib/buildsystems/generate -g Vcxproj
git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
git add git/LinkOrCopyBuiltins.targets

# Add common-cmds.h
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 common-cmds.h

0 comments on commit 5f997af

Please sign in to comment.
You can’t perform that action at this time.