From d37531a856e64e6ebfbf10b511fb7320a71bb550 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 9 Dec 2015 13:56:11 +0100 Subject: [PATCH] Windows: force-recompile git.res for differing architectures When git.rc is compiled into git.res, the result is actually dependent on the architecture. That is, you cannot simply link a 32-bit git.res into a 64-bit git.exe. Therefore, to allow 32-bit and 64-bit builds in the same directory, we let git.res depend on GIT-PREFIX so that it gets recompiled when compiling for a different architecture (this works because the exec path changes based on the architecture: /mingw32/libexec/git-core for 32-bit and /mingw64/libexec/git-core for 64-bit). Signed-off-by: Johannes Schindelin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 186d7808ba..7e58d2be12 100644 --- a/Makefile +++ b/Makefile @@ -1828,7 +1828,7 @@ else RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .rc, ,$(subst .windows., ,$(GIT_VERSION))))))) endif -git.res: git.rc GIT-VERSION-FILE +git.res: git.rc GIT-VERSION-FILE GIT-PREFIX $(QUIET_RC)$(RC) $(RC_VERSION_DEFS) \ -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@