Make it compile again.

svn path=/trunk/; revision=18210
This commit is contained in:
Anders Broman 2006-05-23 05:20:33 +00:00
parent fbd2a3fe3e
commit 4fc8c5fe35
2 changed files with 8 additions and 8 deletions

View File

@ -4,10 +4,10 @@
include ..\config.nmake
ALL_RC=ethereal.rc libethereal.rc tethereal.rc capinfos.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc dumpcap.rc ethereal.exe.manifest
ALL_RC=ethereal.rc libethereal.rc tethereal.rc capinfos.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc dumpcap.rc wireshark.exe.manifest
all : $(ALL_RC)
ethereal.exe.manifest: ethereal.exe.manifest.in ..\config.nmake
wireshark.exe.manifest: ethereal.exe.manifest.in ..\config.nmake
sed -e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \
-e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \
-e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \

View File

@ -21,13 +21,13 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "The Wireshark developer community, http://www.ethereal.com/\0"
VALUE "FileDescription", "Ethereal\0"
VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.com/\0"
VALUE "FileDescription", "Wireshark\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "Ethereal @VERSION@\0"
VALUE "InternalName", "Wireshark @VERSION@\0"
VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "Ethereal.exe\0"
VALUE "ProductName", "Ethereal\0"
VALUE "OriginalFilename", "Wireshark.exe\0"
VALUE "ProductName", "Wireshark\0"
VALUE "ProductVersion", "@VERSION@\0"
END
END
@ -40,4 +40,4 @@ END
#define MANIFEST_RESOURCE_ID 1
#define RT_MANIFEST 24
MANIFEST_RESOURCE_ID RT_MANIFEST "ethereal.exe.manifest"
MANIFEST_RESOURCE_ID RT_MANIFEST "wireshark.exe.manifest"