diff options
| author | Olivier Biot <obiot.ethereal@gmail.com> | 2004-07-28 21:13:27 +0000 |
|---|---|---|
| committer | Olivier Biot <obiot.ethereal@gmail.com> | 2004-07-28 21:13:27 +0000 |
| commit | 028fd26a0efc99f50c364f05cb330502cf6300dd (patch) | |
| tree | 675bf69ca88f41eb68691cb851c7ca07b5e26a8b | |
| parent | cb6b29786bb98412602a039658e5c5b134595b0e (diff) | |
| download | wireshark-028fd26a0efc99f50c364f05cb330502cf6300dd.tar.gz wireshark-028fd26a0efc99f50c364f05cb330502cf6300dd.tar.bz2 wireshark-028fd26a0efc99f50c364f05cb330502cf6300dd.zip | |
Add the MSWIN RC information for capinfo.
svn path=/trunk/; revision=11556
| -rw-r--r-- | Makefile.nmake | 11 | ||||
| -rw-r--r-- | image/Makefile.nmake | 7 | ||||
| -rwxr-xr-x | image/capinfo.rc.in | 36 |
3 files changed, 49 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 45a9b1c9a2..5afdabd6df 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -110,9 +110,12 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(GLIB_LIBS) \ $(NET_SNMP_DIR)\win32\lib\netsnmp.lib -EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe capinfo.exe editcap.exe mergecap.exe text2pcap.exe +EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe \ + capinfo.exe editcap.exe mergecap.exe text2pcap.exe -RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res image\wiretap.res +RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res \ + image\capinfo.res image\editcap.res image\mergecap.res \ + image\text2pcap.res image\wiretap.res all: config.h tools image wiretap epan $(EXECUTABLES) $(RESOURCES) doc @@ -165,10 +168,10 @@ tethereal.exe : config.h svnversion.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) epan /OUT:tethereal.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res << -capinfo.exe : config.h capinfo.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res +capinfo.exe : config.h capinfo.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfo.res @echo Linking $@ $(LINK) @<< - /OUT:capinfo.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfo.obj getopt.obj $(capinfo_LIBS) image\editcap.res + /OUT:capinfo.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfo.obj getopt.obj $(capinfo_LIBS) image\capinfo.res << editcap.exe : config.h editcap.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res diff --git a/image/Makefile.nmake b/image/Makefile.nmake index aec3a46095..db4b2b49aa 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -4,7 +4,7 @@ include ..\config.nmake -ALL_RC=ethereal.rc libethereal.rc tethereal.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc +ALL_RC=ethereal.rc libethereal.rc tethereal.rc capinfo.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc all : $(ALL_RC) ethereal.rc : ethereal.rc.in ..\config.nmake @@ -22,6 +22,11 @@ tethereal.rc : tethereal.rc.in ..\config.nmake -e s/@RC_VERSION@/$(RC_VERSION)/ \ < tethereal.rc.in > $@ +capinfo.rc : capinfo.rc.in ..\config.nmake + sed -e s/@VERSION@/$(VERSION)/ \ + -e s/@RC_VERSION@/$(RC_VERSION)/ \ + < capinfo.rc.in > $@ + editcap.rc : editcap.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ diff --git a/image/capinfo.rc.in b/image/capinfo.rc.in new file mode 100755 index 0000000000..36cc6fa2e2 --- /dev/null +++ b/image/capinfo.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", "Capinfo\0" + VALUE "FileVersion", "@VERSION@\0" + VALUE "InternalName", "Capinfo @VERSION@\0" + VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0" + VALUE "OriginalFilename", "Capinfo.exe\0" + VALUE "ProductName", "Capinfo\0" + VALUE "ProductVersion", "@VERSION@\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END |