forked from osmocom/wireshark
From Graham Bloice: add resources to wiretap.dll.
svn path=/trunk/; revision=11476
This commit is contained in:
parent
43b2da02ae
commit
f28323ba39
|
@ -108,7 +108,7 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
|||
|
||||
EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.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
|
||||
RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res image\wiretap.res
|
||||
|
||||
all: config.h tools image wiretap epan $(EXECUTABLES) $(RESOURCES) doc
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
# $Id$
|
||||
|
||||
VERSION=0.10.5
|
||||
WTAP_VERSION=0.1
|
||||
#
|
||||
# The RC_VERSION should be comma-separated, not dot-separated,
|
||||
# as per Graham Bloice's message in
|
||||
|
@ -13,7 +14,7 @@ VERSION=0.10.5
|
|||
# for the executables, and XP's tooltip, rather than 0.0.0.0."
|
||||
#
|
||||
RC_VERSION=0,10,5
|
||||
WTAP_VERSION=0.1
|
||||
RC_WTAP_VERSION=0,1
|
||||
|
||||
#
|
||||
# If you're building with WinPcap 2.3, set WINPCAP_VERSION to 2.3; if
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
include ..\config.nmake
|
||||
|
||||
ALL_RC=ethereal.rc libethereal.rc tethereal.rc editcap.rc text2pcap.rc mergecap.rc
|
||||
ALL_RC=ethereal.rc libethereal.rc tethereal.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc
|
||||
all : $(ALL_RC)
|
||||
|
||||
ethereal.rc : ethereal.rc.in ..\config.nmake
|
||||
|
@ -37,6 +37,11 @@ text2pcap.rc : text2pcap.rc.in ..\config.nmake
|
|||
-e s/@RC_VERSION@/$(RC_VERSION)/ \
|
||||
< text2pcap.rc.in > $@
|
||||
|
||||
wiretap.rc : wiretap.rc.in ..\config.nmake
|
||||
sed -e s/@VERSION@/$(WTAP_VERSION)/ \
|
||||
-e s/@RC_VERSION@/$(RC_WTAP_VERSION)/ \
|
||||
< wiretap.rc.in > $@
|
||||
|
||||
clean :
|
||||
rm -f $(ALL_RC)
|
||||
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
#include "winver.h"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @RC_VERSION@
|
||||
PRODUCTVERSION @RC_VERSION@
|
||||
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, http://www.ethereal.com/\0"
|
||||
VALUE "FileDescription", "Ethereal capture file library\0"
|
||||
VALUE "FileVersion", "@VERSION@\0"
|
||||
VALUE "InternalName", "wiretap @VERSION@\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
|
||||
VALUE "OriginalFilename", "wiretap-@VERSION@.dll\0"
|
||||
VALUE "ProductName", "Ethereal\0"
|
||||
VALUE "ProductVersion", "@VERSION@\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
|
@ -56,11 +56,12 @@ all: wiretap-$(WTAP_VERSION).dll
|
|||
wiretap-$(WTAP_VERSION).lib: wiretap-$(WTAP_VERSION).dll
|
||||
wiretap-$(WTAP_VERSION).exp: wiretap-$(WTAP_VERSION).dll
|
||||
|
||||
wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def
|
||||
wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def ..\image\wiretap.res
|
||||
$(link) $(dlllflags) $(conlibsdll) \
|
||||
$(LOCAL_LDFLAGS) \
|
||||
/DEF:wtap.def /OUT:wiretap-$(WTAP_VERSION).dll \
|
||||
/IMPLIB:wiretap-$(WTAP_VERSION).lib \
|
||||
..\image\wiretap.res \
|
||||
$(OBJECTS) $(wiretap_LIBS)
|
||||
|
||||
$(OBJECTS): config.h
|
||||
|
|
Loading…
Reference in New Issue