summaryrefslogtreecommitdiff
path: root/desktop/win32
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-08-31 01:17:31 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-08-31 02:48:18 +0200
commitcb204a382da220f8b282d6da507716c918716272 (patch)
treedb0cb4edc3a4d2f3f0049d9ac149dd9bd12c8ec7 /desktop/win32
parent758a4998c56c73d2420c1ee2e3f41bedd153559d (diff)
Unify executables to take version resource from default.rc
Pass file description in optional second argument to gb_Executable_add_default_nativeres. Remove duplicating version resources from officeloader.rc and launcher.rc. Change-Id: I55c4fc85c470c3dd6f03d909a39459839e70b9cd Reviewed-on: https://gerrit.libreoffice.org/78333 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'desktop/win32')
-rw-r--r--desktop/win32/source/applauncher/launcher.rc41
1 files changed, 0 insertions, 41 deletions
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index b76518d7a56a..8e56ef7549e6 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -20,45 +20,4 @@
#include <windows.h>
#include "version.hrc"
-
-// version information
-
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
- PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
- FILEFLAGSMASK 0x3F
- FILEFLAGS
-#if defined(DEBUG)
- VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
- VS_FF_PRERELEASE |
-#endif
- 0
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- {
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- // International StringTable
- VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
- VALUE "FileDescription", PPS(RES_APP_FILEDESC) "\0"
- VALUE "FileVersion", PPS(VER_LEVEL) "\0"
- VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
- VALUE "ProductName", "LibreOffice\0"
- VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
- VALUE "InternalName", PPS(RES_APP_NAME) "\0"
- VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors. All rights reserved.\0"
- }
- }
-
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x0409, 1252
- }
- }
-
1 ICON PPS(RES_APP_ICON)