From c574685a9e4959c1ec3dc14634b9162cd8b09ec5 Mon Sep 17 00:00:00 2001 From: Stelios Bounanos Date: Wed, 14 Oct 2009 04:32:25 +0100 Subject: [PATCH] Update win32 resource files Add a common rc file with more resource information. --- src/Makefile.am | 2 +- src/common.rc | 35 +++++++++++++++++++++++++++++++++++ src/flarq-src/flarqrc.rc | 9 +++++++-- src/fldigirc.rc | 15 ++++++++++----- 4 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 src/common.rc diff --git a/src/Makefile.am b/src/Makefile.am index 680b7776..663fec69 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,7 +105,7 @@ CLEAN_LOCAL = if WIN32 if HAVE_WINDRES .rc.o: - $(call silent,WRES ,$@)$(WINDRES) -I$(srcdir)/include -I$(srcdir)/../data/win32 $< -O coff $@ + $(call silent,WRES ,$@)$(WINDRES) -DRC_BUILD_TIME=\\\"$(shell date +%s)\\\" -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/../data/win32 $< -O coff $@ fldigi_SOURCES += $(FLDIGI_WIN32_RES_SRC) flarq_SOURCES += $(FLARQ_WIN32_RES_SRC) endif diff --git a/src/common.rc b/src/common.rc new file mode 100644 index 00000000..6ed72e1b --- /dev/null +++ b/src/common.rc @@ -0,0 +1,35 @@ +/* + * This file is included by fldigirc.rc and flarqrc.rc, which must both define + * RC_FILE_VERSION_QUAD and RC_FILE_DESCRIPTION and include config.h. + */ + +#include + +VS_VERSION_INFO VERSIONINFO + FILEVERSION RC_FILE_VERSION_QUAD + PRODUCTVERSION RC_FILE_VERSION_QUAD + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS 0 + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", RC_FILE_DESCRIPTION "\0" + VALUE "ProductVersion", PACKAGE_VERSION "\0" + VALUE "FileVersion", PACKAGE_VERSION "." RC_BUILD_TIME "\0" + VALUE "InternalName", PACKAGE_TARNAME "\0" + VALUE "OriginalFilename", PACKAGE_TARNAME ".exe\0" + VALUE "CompanyName", "\0" + VALUE "LegalCopyright", PACKAGE_AUTHORS "\0" + VALUE "Licence", "GPLv2+\0" + VALUE "Info", "http://www.w1hkj.com/\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/src/flarq-src/flarqrc.rc b/src/flarq-src/flarqrc.rc index c1902bad..475a3ad3 100644 --- a/src/flarq-src/flarqrc.rc +++ b/src/flarq-src/flarqrc.rc @@ -1,5 +1,10 @@ -#include // include for version info constants +#define BUILD_FLARQ 1 +#include "config.h" #define IDI_ICON 101 - IDI_ICON ICON DISCARDABLE "flarq.ico" + +#define RC_FILE_VERSION_QUAD FLARQ_VERSION_MAJOR,FLARQ_VERSION_MINOR,0,0 +#define RC_FILE_DESCRIPTION "Fast Light ARQ Application" + +#include "common.rc" diff --git a/src/fldigirc.rc b/src/fldigirc.rc index 5a3752e3..922ccbda 100644 --- a/src/fldigirc.rc +++ b/src/fldigirc.rc @@ -1,5 +1,10 @@ -#include // include for version info constants - -#define IDI_ICON 101 - -IDI_ICON ICON DISCARDABLE "fldigi.ico" +#define BUILD_FLDIGI 1 +#include "config.h" + +#define IDI_ICON 101 +IDI_ICON ICON DISCARDABLE "fldigi.ico" + +#define RC_FILE_VERSION_QUAD FLDIGI_VERSION_MAJOR,FLDIGI_VERSION_MINOR,0,0 +#define RC_FILE_DESCRIPTION "Fast Light Digital Modem Application" + +#include "common.rc"