aboutsummaryrefslogtreecommitdiffstats
path: root/image/mergecap.rc.in
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-10-08 16:34:39 -0700
committerGerald Combs <gerald@wireshark.org>2018-10-10 15:40:21 +0000
commit573e8420027377cce79750b85f416c3b9a740968 (patch)
tree621fb48b7128d83af549d6377258f3fefaebf895 /image/mergecap.rc.in
parentb7107f5fcb9bcc20be33b6263f90d1b20cc1591d (diff)
Windows: Make our program details more consistent.
Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'image/mergecap.rc.in')
-rw-r--r--image/mergecap.rc.in36
1 files changed, 0 insertions, 36 deletions
diff --git a/image/mergecap.rc.in b/image/mergecap.rc.in
deleted file mode 100644
index 46b595b2a4..0000000000
--- a/image/mergecap.rc.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "winver.h"
-
-WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @RC_VERSION@
- PRODUCTVERSION @RC_VERSION@
- FILEFLAGSMASK 0x0L
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "The Wireshark developer community\0"
- VALUE "FileDescription", "Mergecap\0"
- VALUE "FileVersion", "@VERSION@\0"
- VALUE "InternalName", "Mergecap @VERSION@\0"
- VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
- VALUE "OriginalFilename", "Mergecap.exe\0"
- VALUE "ProductName", "Mergecap\0"
- VALUE "ProductVersion", "@VERSION@\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END