Skip to content

Commit b16a93e

Browse files
committed
mingw: include the full version information in the resources
This fixes #723 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent a9786a7 commit b16a93e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1824,7 +1824,8 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
18241824

18251825
git.res: git.rc GIT-VERSION-FILE
18261826
$(QUIET_RC)$(RC) \
1827-
$(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
1827+
$(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \
1828+
$(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \
18281829
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
18291830

18301831
# This makes sure we depend on the NO_PERL setting itself.

git.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
1 VERSIONINFO
2-
FILEVERSION MAJOR,MINOR,0,0
3-
PRODUCTVERSION MAJOR,MINOR,0,0
2+
FILEVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
3+
PRODUCTVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
44
BEGIN
55
BLOCK "StringFileInfo"
66
BEGIN

0 commit comments

Comments
 (0)