Skip to content

Commit 27d3931

Browse files
authored
Fix windows resource FILEVERSION (#40752)
1 parent 87d4e3f commit 27d3931

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cli/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $(BUILDDIR)/julia_res.o: $(JULIAHOME)/contrib/windows/julia.rc $(JULIAHOME)/VERS
7070
JLVER=`cat $(JULIAHOME)/VERSION` && \
7171
JLVERi=`echo $$JLVER | perl -nle \
7272
'/^(\d+)\.?(\d*)\.?(\d*)/ && \
73-
print int $$1,",",int $$2,",0,",int $$3'` && \
73+
print int $$1,",",int $$2,",",int $$3,",0"'` && \
7474
$(CROSS_COMPILE)windres $< -O coff -o $@ -DJLVER=$$JLVERi -DJLVER_STR=\\\"$$JLVER\\\"
7575
EXE_OBJS += $(BUILDDIR)/julia_res.o
7676
EXE_DOBJS += $(BUILDDIR)/julia_res.o

contrib/windows/julia.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#include <winver.h>
22
#include <winuser.h>
3-
1 VERSIONINFO
3+
VS_VERSION_INFO VERSIONINFO
44
FILEVERSION JLVER
55
PRODUCTVERSION JLVER
66
/*
7-
FILEFLAGSMASK VS_FF_PRERELEASE
8-
FILEFLAGS VS_FF_PRERELEASE
7+
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8+
FILEFLAGS VER_PRIVATEBUILD
99
*/
10-
FILEOS VOS_DOS_WINDOWS32
10+
FILEOS VOS__WINDOWS32
1111
FILETYPE VFT_APP
1212
BEGIN
1313
BLOCK "StringFileInfo"

0 commit comments

Comments
 (0)