From 8b7458119f0653d41fb8017ba07f8272a0af1e2f Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Sat, 16 Mar 2019 01:30:34 +0000 Subject: [PATCH] Tweak version string resources for EMBED_CHM. So that it's possible to distinguish the CHMful from the CHMless binary without running it. --- windows/putty.rc | 2 +- windows/puttytel.rc | 2 +- windows/version.rc2 | 4 ++++ windows/winhelp.rc2 | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/windows/putty.rc b/windows/putty.rc index 8cec7df5..fd585178 100644 --- a/windows/putty.rc +++ b/windows/putty.rc @@ -3,8 +3,8 @@ #define APPNAME "PuTTY" #define APPDESC "SSH, Telnet and Rlogin client" -#include "win_res.rc2" #include "winhelp.rc2" +#include "win_res.rc2" #ifndef NO_MANIFESTS 1 RT_MANIFEST "putty.mft" diff --git a/windows/puttytel.rc b/windows/puttytel.rc index 3db9c53f..259bc683 100644 --- a/windows/puttytel.rc +++ b/windows/puttytel.rc @@ -3,8 +3,8 @@ #define APPNAME "PuTTYtel" #define APPDESC "Telnet and Rlogin client" -#include "win_res.rc2" #include "winhelp.rc2" +#include "win_res.rc2" #ifndef NO_MANIFESTS 1 RT_MANIFEST "puttytel.mft" diff --git a/windows/version.rc2 b/windows/version.rc2 index 5cc127a4..e200a2a4 100644 --- a/windows/version.rc2 +++ b/windows/version.rc2 @@ -46,7 +46,11 @@ BEGIN VALUE "FileDescription", APPDESC VALUE "InternalName", APPNAME VALUE "OriginalFilename", APPNAME +#if (defined HELPVER) + VALUE "FileVersion", TEXTVER HELPVER +#else VALUE "FileVersion", TEXTVER +#endif VALUE "ProductVersion", TEXTVER VALUE "LegalCopyright", "Copyright \251 " SHORT_COPYRIGHT_DETAILS "." #if (!defined SNAPSHOT) && (!defined RELEASE) && (!defined PRERELEASE) diff --git a/windows/winhelp.rc2 b/windows/winhelp.rc2 index f1e26e73..3499d25e 100644 --- a/windows/winhelp.rc2 +++ b/windows/winhelp.rc2 @@ -2,4 +2,7 @@ #ifdef EMBED_CHM ID_CUSTOM_CHMFILE TYPE_CUSTOM_CHMFILE "../doc/putty.chm" +#define HELPVER " (with embedded help)" +#else +#define HELPVER " (without embedded help)" #endif