diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-07-12 19:59:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-07-12 19:59:41 +0000 |
| commit | e9d00f4a4fa54544e1a01e24fb445434dcbf8abe (patch) | |
| tree | a9c35951bce334dbad1c8c393d6cd7cd87641971 /image | |
| parent | c5881bc7b9d9eee2b76806e3d0c79cc44eedecbd (diff) | |
| download | wireshark-e9d00f4a4fa54544e1a01e24fb445434dcbf8abe.tar.gz wireshark-e9d00f4a4fa54544e1a01e24fb445434dcbf8abe.tar.bz2 wireshark-e9d00f4a4fa54544e1a01e24fb445434dcbf8abe.zip | |
Mergecap utility for merging capture files, from Scott Renfro.
svn path=/trunk/; revision=3701
Diffstat (limited to 'image')
| -rw-r--r-- | image/Makefile.nmake | 7 | ||||
| -rw-r--r-- | image/mergecap.rc.in | 36 |
2 files changed, 42 insertions, 1 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake index 62de6a25d4..cbce6b46e3 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.2 2001/05/21 05:04:49 guy Exp $ +# $Id: Makefile.nmake,v 1.3 2001/07/12 19:59:41 guy Exp $ # include ..\config.nmake @@ -22,6 +22,11 @@ editcap.rc : editcap.rc.in -e s/@RC_VERSION@/$(RC_VERSION)/ \ < editcap.rc.in > $@ +mergecap.rc : mergecap.rc.in + sed -e s/@VERSION@/$(VERSION)/ \ + -e s/@RC_VERSION@/$(RC_VERSION)/ \ + < mergecap.rc.in > $@ + text2pcap.rc : text2pcap.rc.in sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ diff --git a/image/mergecap.rc.in b/image/mergecap.rc.in new file mode 100644 index 0000000000..212d89c956 --- /dev/null +++ b/image/mergecap.rc.in @@ -0,0 +1,36 @@ +#include "winver.h" + +ETHEREAL_ICON ICON "ethereal.ico" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @RC_VERSION@,0 + PRODUCTVERSION @RC_VERSION@,0 + FILEFLAGSMASK 0x0L +#ifdef _DEBUG + FILEFLAGS 0x3L +#else + FILEFLAGS 0x2L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The Ethereal developer community\0" + VALUE "FileDescription", "Mergecap\0" + VALUE "FileVersion", "@VERSION@\0" + VALUE "InternalName", "Mergecap @VERSION@\0" + VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@xiexie.org> 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 |