Skip to content

Commit 5f997af

Browse files
committed
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>
1 parent af5e32d commit 5f997af

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

config.mak.uname

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,11 @@ vcxproj:
718718
git diff-files --quiet && \
719719
git diff-index --cached --quiet HEAD --
720720

721+
# Make .vcxproj files and add them
722+
unset QUIET_GEN QUIET_BUILT_IN; \
723+
perl contrib/buildsystems/generate -g Vcxproj
724+
git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
725+
721726
# Generate the LinkOrCopyBuiltins.targets file
722727
(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
723728
echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
@@ -731,11 +736,7 @@ vcxproj:
731736
done && \
732737
echo ' </Target>' && \
733738
echo '</Project>') >git/LinkOrCopyBuiltins.targets
734-
735-
# Make .vcxproj files and add them
736-
unset QUIET_GEN QUIET_BUILT_IN; \
737-
perl contrib/buildsystems/generate -g Vcxproj
738-
git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
739+
git add git/LinkOrCopyBuiltins.targets
739740

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

0 commit comments

Comments
 (0)