osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

A few more changes to remove "lib" from "libwsutil" on Windows. 

Change-Id: I4c694bb44ebced3d7ae66c16ec3a3ec58825d451
Reviewed-on: https://code.wireshark.org/review/2970
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-07-09 16:43:32 -07:00
parent 28719a4e4e
commit 2fbedef5d1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
image/libwsutil.rc.in
View File

@ -20,9 +20,9 @@ BEGIN
VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0"
VALUE "FileDescription", "Wireshark utility library\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "libwsutil @VERSION@\0"
VALUE "InternalName", "wsutil @VERSION@\0"
VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "libwsutil.dll\0"
VALUE "OriginalFilename", "wsutil.dll\0"
VALUE "ProductName", "Wireshark\0"
VALUE "ProductVersion", "@VERSION@\0"
END

2
packaging/nsis/Makefile.nmake
View File

@ -17,7 +17,7 @@ EXE=../../tshark.exe ../../editcap.exe \
../../wireshark.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/wsutil.dll
DOC=../../doc/ws.css \
../../doc/capinfos.html \
../../doc/dumpcap.html \

2
packaging/nsis/wireshark.nsi
View File

@ -287,7 +287,7 @@ File "${STAGING_DIR}\wiretap-${WTAP_VERSION}.dll"
!ifdef ENABLE_LIBWIRESHARK
File "${STAGING_DIR}\libwireshark.dll"
!endif
File "${STAGING_DIR}\libwsutil.dll"
File "${STAGING_DIR}\wsutil.dll"
File "${STAGING_DIR}\libgio-2.0-0.dll"
File "${STAGING_DIR}\libglib-2.0-0.dll"
File "${STAGING_DIR}\libgobject-2.0-0.dll"