aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-12-03 21:32:25 +0100
committerGuy Harris <guy@alum.mit.edu>2015-12-03 23:54:49 +0000
commit651e0884b7d9fdf64d5310c4e317d757d2357259 (patch)
tree5130af56d46332ddfb40e9ed3a71e04e9a67c88d /packaging
parent687b2dcadc22e2404c9ad7516eca2fa868338120 (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 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake2
-rw-r--r--packaging/nsis/wireshark.nsi1
2 files changed, 2 insertions, 1 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 57a849d149..6f70c969fd 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -18,7 +18,7 @@ EXE=../../tshark.exe ../../editcap.exe \
../../wireshark-gtk.exe \
!ENDIF
../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(WINPCAP_VERSION).exe
-DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll
+DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll ../../codecs/libwscodecs.dll
DOC=../../doc/ws.css \
../../doc/androiddump.html \
../../doc/capinfos.html \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index a0bc298b5c..57ff291a8e 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -357,6 +357,7 @@ File "${STAGING_DIR}\wiretap-${WTAP_VERSION}.dll"
!ifdef ENABLE_LIBWIRESHARK
File "${STAGING_DIR}\libwireshark.dll"
!endif
+File "${STAGING_DIR}\libwscodecs.dll"
File "${STAGING_DIR}\libwsutil.dll"
!include all-manifest.nsh