diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2012-12-21 15:03:35 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2012-12-21 15:03:35 +0000 |
| commit | 6c1435408ef07ffbb7ab4fd800d2bbf8a534a499 (patch) | |
| tree | 86df4213e256e2ee94bfbb4965e4c5a950489f27 /Makefile.nmake | |
| parent | 4c08d75359e687020aa16f0a7624a78328aa67a2 (diff) | |
This should get it building on Windows.
svn path=/trunk/; revision=46676
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 88b1453e91..0ef331d5d6 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -64,7 +64,7 @@ include Makefile.common wireshark_OBJECTS = $(wireshark_SOURCES:.c=.obj) tshark_OBJECTS = $(tshark_SOURCES:.c=.obj) rawshark_OBJECTS = $(rawshark_SOURCES:.c=.obj) -text2pcap_OBJECTS = $(text2pcap_SOURCES:.c=.obj) +###text2pcap_OBJECTS = $(text2pcap_SOURCES:.c=.obj) ###mergecap_OBJECTS = $(mergecap_SOURCES:.c=.obj) editcap_OBJECTS = $(editcap_SOURCES:.c=.obj) capinfos_OBJECTS = $(capinfos_SOURCES:.c=.obj) @@ -362,10 +362,10 @@ reordercap.exe : $(LIBS_CHECK) config.h reordercap.obj wsutil\libwsutil.lib wir mt.exe -nologo -manifest "reordercap.exe.manifest" -outputresource:reordercap.exe;1 !ENDIF -text2pcap.exe : $(LIBS_CHECK) config.h $(text2pcap_OBJECTS) text2pcap-scanner.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res +text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj pcapio.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res @echo Linking $@ $(LINK) @<< - /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(text2pcap_OBJECTS) text2pcap-scanner.obj $(text2pcap_LIBS) image\text2pcap.res + /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj pcapio.obj $(text2pcap_LIBS) image\text2pcap.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "text2pcap.exe.manifest" -outputresource:text2pcap.exe;1 |