diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-03-24 13:00:07 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-03-24 20:49:37 +0000 |
commit | a4aa8930bb47296704a4689cdbfa8f5b8b3f550f (patch) | |
tree | fe563c1aeafdd8064dcadfb472fa62cf18f0fbfb /Makefile.nmake | |
parent | 67bd2cc511bc081b51b649c22240f5ca81383dc6 (diff) | |
download | wireshark-a4aa8930bb47296704a4689cdbfa8f5b8b3f550f.tar.gz |
Put pcapio.c into a writecap library, and use it.
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e
Reviewed-on: https://code.wireshark.org/review/14615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 0ad2c4ebd6..77be3386c9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -168,12 +168,14 @@ reordercap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ text2pcap_LIBS= \ wsock32.lib user32.lib \ + writecap\libwritecap.lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) dumpcap_LIBS= \ wsock32.lib user32.lib \ caputils\libcaputils.lib \ + writecap\libwritecap.lib \ wsutil\libwsutil.lib \ $(GLIB_LIBS) @@ -393,10 +395,10 @@ reordercap.exe : $(LIBS_CHECK) config.h $(reordercap_OBJECTS) wsutil\libwsutil. mt.exe -nologo -manifest "reordercap.exe.manifest" -outputresource:reordercap.exe;1 !ENDIF -text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj pcapio.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res +text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj writecap\libwritecap.lib wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res @echo Linking $@ $(LINK) @<< - /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj pcapio.obj $(text2pcap_LIBS) image\text2pcap.res + /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj $(text2pcap_LIBS) image\text2pcap.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "text2pcap.exe.manifest" -outputresource:text2pcap.exe;1 @@ -420,7 +422,7 @@ randpkt.exe : $(randpkt_OBJECTS) randpkt_core mt.exe -nologo -manifest "randpkt.exe.manifest" -outputresource:randpkt.exe;1 !ENDIF -dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) caputils wsutil\libwsutil.lib image\dumpcap.res +dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) caputils writecap\libwritecap.lib wsutil\libwsutil.lib image\dumpcap.res @echo Linking $@ $(LINK) @<< /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(dumpcap_LIBS) $(dumpcap_OBJECTS) image\dumpcap.res |