From 3812d2e22efe137977a80bb3e7dfee4289c6bed6 Mon Sep 17 00:00:00 2001 From: Oleg Shparber Date: Tue, 29 Aug 2017 01:44:46 +0300 Subject: [PATCH] app: Fix version info encoding --- CMakeLists.txt | 11 +---------- src/app/versioninfo.rc.in | 6 ++++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b09cd7..3d096c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,16 +11,7 @@ else() endif() set(PROJECT_COMPANY_NAME "ZealDocs") - -# CMake <= 3.8.0 doesn't support Unicode on Windows: -# https://gitlab.kitware.com/cmake/cmake/commit/335a29cb07a8d014a9ed4d4dbf25e49da3a78b33 -# Comparing with 3.8.1 to catch 3.8.0-rc1: https://gitlab.kitware.com/cmake/cmake/issues/16656 -if(WIN32 AND CMAKE_VERSION VERSION_LESS 3.8.1) - string(TIMESTAMP PROJECT_COPYRIGHT "(C) 2015-%Y Oleg Shparber" UTC) -else() - string(TIMESTAMP PROJECT_COPYRIGHT "© 2015-%Y Oleg Shparber" UTC) -endif() - +string(TIMESTAMP PROJECT_COPYRIGHT "© 2015-2017 Oleg Shparber" UTC) set(PROJECT_DESCRIPTION "A simple documentation browser.") set(PROJECT_URL "https://zealdocs.org") diff --git a/src/app/versioninfo.rc.in b/src/app/versioninfo.rc.in index 03f89eb..389cc76 100644 --- a/src/app/versioninfo.rc.in +++ b/src/app/versioninfo.rc.in @@ -1,5 +1,7 @@ #include +#pragma code_page(65001) + IDI_ICON1 ICON DISCARDABLE "resources/zeal.ico" #define VER_COMPANYNAME_STR "${PROJECT_COMPANY_NAME}" @@ -34,7 +36,7 @@ FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904E4" + BLOCK "040904B0" BEGIN VALUE "CompanyName", VER_COMPANYNAME_STR VALUE "FileDescription", VER_FILEDESCRIPTION_STR @@ -51,6 +53,6 @@ BEGIN BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1252 + VALUE "Translation", 0x0409, 1200 END END