From 5f997af33c0e6723cde4ac9d8afc2fec6d08ed0b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 20 Dec 2017 23:17:05 +0100 Subject: [PATCH] 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 --- config.mak.uname | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index d324ecf22a..8bac4a8597 100644 --- a/config.mak.uname +++ b/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 '' && \ echo ' ' && \ @@ -731,11 +736,7 @@ vcxproj: done && \ echo ' ' && \ echo '') >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