diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-03-04 02:42:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-03-04 02:42:07 +0000 |
| commit | 7923c40e07fce55301588705d108f50812415941 (patch) | |
| tree | 2c500a2cc5e2194583f178f855284887816d2958 /Makefile.nmake | |
| parent | a48001b2bf9f23ee0fa85464ff8f5e508e25e36e (diff) | |
| download | wireshark-7923c40e07fce55301588705d108f50812415941.tar.gz wireshark-7923c40e07fce55301588705d108f50812415941.tar.bz2 wireshark-7923c40e07fce55301588705d108f50812415941.zip | |
Include inet_pton.obj when building TShark, as we now need it.
(But it built on the Win64 buildbot; did Microsoft add it in later
releases? If so, should we include it only if it's needed?)
svn path=/trunk/; revision=32107
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 11974beade..819033b83e 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -261,10 +261,10 @@ wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) wsgetopt.obj inet_nt mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:wireshark.exe;1 !ENDIF -tshark.exe : $(LIBS_CHECK) config.h $(tshark_OBJECTS) wsgetopt.obj inet_ntop.obj epan image\tshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins +tshark.exe : $(LIBS_CHECK) config.h $(tshark_OBJECTS) wsgetopt.obj inet_ntop.obj inet_pton.obj epan image\tshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins @echo Linking $@ $(LINK) @<< - /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console $(tshark_LIBS) $(tshark_OBJECTS) wsgetopt.obj inet_ntop.obj image\tshark.res + /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console $(tshark_LIBS) $(tshark_OBJECTS) wsgetopt.obj inet_ntop.obj inet_pton.obj image\tshark.res << !IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "tshark.exe.manifest" -outputresource:tshark.exe;1 |