diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-01-16 04:40:18 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-01-16 04:40:18 +0000 |
| commit | fa83e20a08de8d6cc62855d02459f2f25050e7f3 (patch) | |
| tree | b88b7ee5a5b77c98d5ea66748e238cefba1d12c9 /Makefile.nmake | |
| parent | c0ef7ab1ada1340f106323f60f59afc30427c5b1 (diff) | |
| download | wireshark-fa83e20a08de8d6cc62855d02459f2f25050e7f3.tar.gz | |
dumpcap link: remove duplicate epan/unicode-utils.obj
svn path=/trunk/; revision=24111
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 17508c13bb..b5e9cd568c 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -286,7 +286,7 @@ randpkt.exe : $(randpkt_OBJECTS) getopt.obj dumpcap.exe : $(LIBS_CHECK) config.h svnversion.h $(dumpcap_OBJECTS) getopt.obj epan/unicode-utils.obj inet_ntop.obj mkstemp.obj wiretap\wiretap-$(WTAP_VERSION).lib image\dumpcap.res @echo Linking $@ $(LINK) @<< - /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj epan/unicode-utils.obj inet_ntop.obj mkstemp.obj image\dumpcap.res + /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) getopt.obj inet_ntop.obj mkstemp.obj image\dumpcap.res << !IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" mt.exe -nologo -manifest "dumpcap.exe.manifest" -outputresource:dumpcap.exe;1 |