From bfa4bbd50da3f143074fa87b46b50b749d7d7948 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 23 Dec 2022 17:44:44 -0600 Subject: [PATCH] Full version info now available for Windows File/Properties/Details Will show git version until released https://github.com/Hamlib/Hamlib/issues/1168 --- src/Makefile.am | 2 +- src/version_dll.rc | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 90c34e428..47c8ec9bb 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,7 +51,7 @@ LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE) $(LTRCCOMPILE) -i "$<" -o "$@" .rc.o: - $(RCCOMPILE) -i "$<" -o "$@" + $(RCCOMPILE) -O coff -i "$<" -o "$@" .mc.rc: $(WINDMC) "$<" diff --git a/src/version_dll.rc b/src/version_dll.rc index 1abe9f548..329aefc6d 100755 --- a/src/version_dll.rc +++ b/src/version_dll.rc @@ -1,20 +1,22 @@ #include #include +#include -#define VERSIONINFO_1 1 +//#define HAMLIB_RC_FILEVERSION 4,6,0,0 -VERSIONINFO_1 VERSIONINFO +VS_VERSION_INFO VERSIONINFO +FILEVERSION ABI_VERSION,ABI_REVISION,ABI_AGE,0 +FILETYPE VFT_DLL +FILESUBTYPE VFT2_UNKNOWN { BLOCK "StringFileInfo" { BLOCK "040904E4" { VALUE "FileDescription", "Hamlib DLL" - VALUE "FileVersion", "4.6.0.0" - VALUE "ProductName", "Hamlib" + VALUE "ProductName", PACKAGE_STRING VALUE "ProductVersion", HAMLIBDATETIME - VALUE "InternalName", "sha256" - VALUE "LegalCopyright", "Copyright Hamlib Team 2022" + VALUE "LegalCopyright", "Copyright Hamlib Team 1991-2023" VALUE "OriginalFilename", "libhamlib-4.dll" } @@ -22,7 +24,6 @@ VERSIONINFO_1 VERSIONINFO BLOCK "VarFileInfo" { - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x409, 20127 } - }