diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-12-03 21:32:25 +0100 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-12-03 23:54:49 +0000 |
| commit | 651e0884b7d9fdf64d5310c4e317d757d2357259 (patch) | |
| tree | 5130af56d46332ddfb40e9ed3a71e04e9a67c88d /image | |
| parent | 687b2dcadc22e2404c9ad7516eca2fa868338120 (diff) | |
Change codecs from static to dynamic library
This allows to properly register codecs plugins.
See https://www.wireshark.org/lists/wireshark-dev/201511/msg00202.html for details.
Change-Id: Ibc13a19936abb7a2e81b86582a75fa424351565b
Reviewed-on: https://code.wireshark.org/review/12385
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'image')
| -rw-r--r-- | image/Makefile.nmake | 7 | ||||
| -rw-r--r-- | image/libwscodecs.rc.in | 34 |
2 files changed, 40 insertions, 1 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake index d7910e651a..2e9a99de86 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -4,7 +4,7 @@ include ..\config.nmake # Nmake uses an implicit rule to build a .res from a .rc file! -ALL_RC=wireshark.rc libwireshark.rc tshark.rc tfshark.rc rawshark.rc capinfos.rc captype.rc editcap.rc text2pcap.rc mergecap.rc reordercap.rc wiretap.rc dumpcap.rc libwsutil.rc wireshark.exe.manifest +ALL_RC=wireshark.rc libwireshark.rc tshark.rc tfshark.rc rawshark.rc capinfos.rc captype.rc editcap.rc text2pcap.rc mergecap.rc reordercap.rc wiretap.rc dumpcap.rc libwscodecs.rc libwsutil.rc wireshark.exe.manifest all : $(ALL_RC) # wireshark.exe.manifest and wireshark.rc are used for both Qt and GTK+ executables. @@ -85,6 +85,11 @@ wiretap.rc : wiretap.rc.in ..\config.nmake -e s/@RC_VERSION@/$(RC_WTAP_VERSION)/ \ < wiretap.rc.in > $@ +libwscodecs.rc : libwscodecs.rc.in ..\config.nmake + sed -e s/@VERSION@/$(VERSION)/ \ + -e s/@RC_VERSION@/$(RC_VERSION)/ \ + < libwscodecs.rc.in > $@ + libwsutil.rc : libwsutil.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ diff --git a/image/libwscodecs.rc.in b/image/libwscodecs.rc.in new file mode 100644 index 0000000000..c87dba8987 --- /dev/null +++ b/image/libwscodecs.rc.in @@ -0,0 +1,34 @@ +#include "winver.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @RC_VERSION@ + PRODUCTVERSION @RC_VERSION@ + FILEFLAGSMASK 0x0L +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" + VALUE "FileDescription", "Wireshark codecs library\0" + VALUE "FileVersion", "@VERSION@\0" + VALUE "InternalName", "libwscodecs @VERSION@\0" + VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0" + VALUE "OriginalFilename", "libwscodecs.dll\0" + VALUE "ProductName", "Wireshark\0" + VALUE "ProductVersion", "@VERSION@\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END |