From 4f25f4c81c1681cc82fe643e1ac985cb19ee0f84 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 27 Sep 2017 22:59:44 +0200 Subject: [PATCH] Fixed generation of .rc file. --- src/klayout_main/klayout.rc | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/klayout_main/klayout.rc b/src/klayout_main/klayout.rc index 818b90562..a1131b7cd 100644 --- a/src/klayout_main/klayout.rc +++ b/src/klayout_main/klayout.rc @@ -19,15 +19,12 @@ # endif #define STRINGIFY_(x) #x -#define STRINGIFY(x) STRINGIFY_(x) - -#define ZERO \\0 -#define SPACE \040 +#define STRINGIFY(x) STRINGIFY_(x\0) #define DESCRIPTION_STRING KLayout Application #define PRODUCTNAME_STRING KLayout #define COPYRIGHT_STRING GPL 2.0 (or later) by Matthias Koefferlein -#define COMMENT_STRING DESCRIPTION_STRING##SPACE##KLAYOUT_VERSION##SPACE##KLAYOUT_VERSION_DATE##SPACE##KLAYOUT_VERSION_REV +#define COMMENT_STRING DESCRIPTION_STRING KLAYOUT_VERSION KLAYOUT_VERSION_DATE KLAYOUT_VERSION_REV /** * The application logo @@ -55,13 +52,13 @@ VS_VERSION_INFO VERSIONINFO BLOCK "040904b0" BEGIN VALUE "CompanyName", "\0" - VALUE "Comments", STRINGIFY(COMMENT_STRING##ZERO) - VALUE "FileDescription", STRINGIFY(DESCRIPTION_STRING##ZERO) - VALUE "FileVersion", STRINGIFY(KLAYOUT_VERSION##ZERO) - VALUE "LegalCopyright", STRINGIFY(COPYRIGHT_STRING##ZERO) + VALUE "Comments", STRINGIFY(COMMENT_STRING) + VALUE "FileDescription", STRINGIFY(DESCRIPTION_STRING) + VALUE "FileVersion", STRINGIFY(KLAYOUT_VERSION) + VALUE "LegalCopyright", STRINGIFY(COPYRIGHT_STRING) VALUE "OriginalFilename", "klayout.exe\0" - VALUE "ProductName", STRINGIFY(PRODUCTNAME_STRING##ZERO) - VALUE "ProductVersion", STRINGIFY(KLAYOUT_VERSION##ZERO) + VALUE "ProductName", STRINGIFY(PRODUCTNAME_STRING) + VALUE "ProductVersion", STRINGIFY(KLAYOUT_VERSION) END END BLOCK "VarFileInfo"