commit 759a7fd71e211c4dd99b1d5973c4d645baacf518
parent bb8c99363f7b1c9630b3ed8f4f2a78c3a084aa01
Author: Jonathan Boeing <jonathan@claws-mail.org>
Date: Fri, 27 Aug 2021 12:30:40 -0700
Add Windows VERSIONINFO resource to executable
Diffstat:
5 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -110,6 +110,7 @@ Makefile.in
/src/quote_fmt_parse.h
/src/tags
/src/TAGS
+/src/w32-resource.rc
/src/ylwrap
/stamp-h
/stamp-h1
diff --git a/configure.ac b/configure.ac
@@ -2118,6 +2118,7 @@ m4/Makefile
po/Makefile.in
src/common/version.h
src/Makefile
+src/w32-resource.rc
src/common/Makefile
src/common/passcrypt.h
src/common/tests/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 the Claws Mail team.
+# Copyright 1999-2021 the Claws Mail team.
# This file is part of Claws Mail package, and distributed under the
# terms of the General Public License version 3 (or later).
# See COPYING file for license details.
@@ -20,12 +20,8 @@ endif
bin_PROGRAMS = claws-mail
if PLATFORM_WIN32
-LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
- sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
-
%.o : %.rc
- $(LTRCCOMPILE) -i $< -o $@
+ $(LIBTOOL) --mode=compile --tag=RC $(RC) -I$(srcdir) -i $< -o $@
claws_mail_res_ldflag = -Wl,w32-resource.o
claws_mail_deps = w32-resource.o
@@ -378,7 +374,7 @@ CLEANFILES = \
EXTRA_DIST = \
claws-contacts.xml \
- w32-logo.ico w32-resource.rc \
+ w32-logo.ico \
pixmaps/addr_one.xpm \
pixmaps/addr_two.xpm \
pixmaps/address_book.xpm \
diff --git a/src/w32-resource.rc b/src/w32-resource.rc
@@ -1 +0,0 @@
-1 ICON "w32-logo.ico"
diff --git a/src/w32-resource.rc.in b/src/w32-resource.rc.in
@@ -0,0 +1,36 @@
+#include <winver.h>
+
+1 ICON "w32-logo.ico"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION @MAJOR_VERSION@,@MINOR_VERSION@,@MICRO_VERSION@,@EXTRA_VERSION@
+PRODUCTVERSION @MAJOR_VERSION@,@MINOR_VERSION@,@MICRO_VERSION@,@EXTRA_VERSION@
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEFLAGS 0x0L
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+// VALUE "Comments", ""
+ VALUE "CompanyName", "The Claws Mail Team"
+ VALUE "FileDescription", "Claws Mail"
+ VALUE "FileVersion", "@VERSION@"
+ VALUE "InternalName", "claws-mail"
+ VALUE "LegalCopyright", "GPL-3.0-or-later / © 1999-2021 The Claws Mail Team & Hiroyuki Yamamoto"
+// VALUE "LegalTrademarks", ""
+ VALUE "OriginalFilename", "claws-mail.exe"
+// VALUE "PrivateBuild", ""
+ VALUE "ProductName", "Claws Mail"
+ VALUE "ProductVersion", "@GIT_VERSION@ for Windows"
+// VALUE "SpecialBuild", ""
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 1200
+ END
+END
