Merge branch 'js/mingw-res-rebuild'
Windows build update. * js/mingw-res-rebuild: Windows: force-recompile git.res for differing architectures
This commit is contained in:
commit
39847644ad
2
Makefile
2
Makefile
@ -2111,7 +2111,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
|
||||
$(QUIET_GEN)$(cmd_munge_script) && \
|
||||
mv $@+ $@
|
||||
|
||||
git.res: git.rc GIT-VERSION-FILE
|
||||
git.res: git.rc GIT-VERSION-FILE GIT-PREFIX
|
||||
$(QUIET_RC)$(RC) \
|
||||
$(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \
|
||||
$(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \
|
||||
|
Loading…
Reference in New Issue
Block a user