diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-05-21 05:04:49 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-05-21 05:04:49 +0000 |
| commit | 12b7880b99e0b3fa1370ca3862031dc1b53a03f8 (patch) | |
| tree | e10d950b2fc0b4db5f875a0c9f9d5a59fc1c71ef | |
| parent | ad61e24f6b27e0bbabb63a0f359fcb3eadf0e2a3 (diff) | |
Add resource stuff for text2pcap.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3429 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.nmake | 8 | ||||
| -rw-r--r-- | image/Makefile.nmake | 9 | ||||
| -rw-r--r-- | image/text2pcap.rc.in | 36 |
4 files changed, 49 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 558149f5fd..602c4ad7a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.320 2001/05/20 22:20:33 guy Exp $ +# $Id: Makefile.am,v 1.321 2001/05/21 05:04:48 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -656,6 +656,7 @@ EXTRA_DIST = \ image/icon-excl.xpm \ image/icon-ethereal.xpm \ image/tethereal.rc.in \ + image/text2pcap.rc.in \ INSTALL.configure \ Makefile.nmake \ make-reg-dotc \ diff --git a/Makefile.nmake b/Makefile.nmake index bb5a90f93d..7f92460ee5 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.107 2001/05/21 03:17:14 guy Exp $ +# $Id: Makefile.nmake,v 1.108 2001/05/21 05:04:48 guy Exp $ include config.nmake include <win32.mak> @@ -273,7 +273,7 @@ dftest_LIBS= epan\ethereal.lib \ EXECUTABLES=ethereal.exe tethereal.exe editcap.exe text2pcap.exe -RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res +RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\text2pcap.res all: tools wiretap gtk epan image $(EXECUTABLES) $(RESOURCES) @@ -295,10 +295,10 @@ editcap.exe : config.h editcap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).li /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(editcap_LIBS) image\editcap.res << -text2pcap.exe : config.h text2pcap.obj text2pcap-scanner.obj getopt.obj +text2pcap.exe : config.h text2pcap.obj text2pcap-scanner.obj getopt.obj image\text2pcap.res @echo Linking $@ $(LINK) @<< - /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj + /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj getopt.obj image\text2pcap.res << dftest.exe : $(dftest_OBJECTS) $(EXTRA_OBJECTS) diff --git a/image/Makefile.nmake b/image/Makefile.nmake index f8984b26b7..62de6a25d4 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -1,10 +1,10 @@ # -# $Id: Makefile.nmake,v 1.1 2001/04/05 04:39:26 gram Exp $ +# $Id: Makefile.nmake,v 1.2 2001/05/21 05:04:49 guy Exp $ # include ..\config.nmake -ALL_RC=ethereal.rc tethereal.rc editcap.rc +ALL_RC=ethereal.rc tethereal.rc editcap.rc text2pcap.rc all : $(ALL_RC) ethereal.rc : ethereal.rc.in @@ -22,5 +22,10 @@ editcap.rc : editcap.rc.in -e s/@RC_VERSION@/$(RC_VERSION)/ \ < editcap.rc.in > $@ +text2pcap.rc : text2pcap.rc.in + sed -e s/@VERSION@/$(VERSION)/ \ + -e s/@RC_VERSION@/$(RC_VERSION)/ \ + < text2pcap.rc.in > $@ + clean : rm -f $(ALL_RC) diff --git a/image/text2pcap.rc.in b/image/text2pcap.rc.in new file mode 100644 index 0000000000..ba942d4cfb --- /dev/null +++ b/image/text2pcap.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", "Text2pcap\0" + VALUE "FileVersion", "@VERSION@\0" + VALUE "InternalName", "Editcap @VERSION@\0" + VALUE "LegalCopyright", "Copyright © 2001 Ashok Narayanan <ashokn@cisco.com>\0" + VALUE "OriginalFilename", "Text2pcap.exe\0" + VALUE "ProductName", "Text2pcapp\0" + VALUE "ProductVersion", "@VERSION@\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END |