diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-02-21 22:06:50 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-02-21 22:06:50 +0000 |
| commit | b96c45d3917fec4d21c4e137b85bfc3c1cc10896 (patch) | |
| tree | 95ac7fda770db306df3e4b33f31b35dc3136c86a /Makefile.nmake | |
| parent | e3283446cc4a41256ade9b45f83cad10e0fe767d (diff) | |
Enable command-line wildcard expansion when invoking mergecap and capinfos
by linking those executables with setargv.obj.
See http://www.wireshark.org/lists/wireshark-users/201002/msg00194.html
(and preceeding messages in the thread).
svn path=/trunk/; revision=31943
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index cddaa12071..11974beade 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -281,10 +281,11 @@ rawshark.exe : $(LIBS_CHECK) config.h $(rawshark_OBJECTS) wsgetopt.obj inet_ntop # XXX: This makefile does not properly handle doing a 'nmake ... capinfos.exe' directly since some of the .objs # (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake (which happens for 'nmake ... all'). +# Linking with setargv.obj enables "wildcard expansion" of command-line arguments capinfos.exe : $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsgetopt.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res @echo Linking $@ $(LINK) @<< - /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(capinfos_OBJECTS) wsgetopt.obj $(capinfos_LIBS) image\capinfos.res + /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(capinfos_OBJECTS) wsgetopt.obj $(capinfos_LIBS) setargv.obj image\capinfos.res << !IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "capinfos.exe.manifest" -outputresource:capinfos.exe;1 @@ -301,10 +302,11 @@ editcap.exe : $(LIBS_CHECK) config.h $(editcap_OBJECTS) wsgetopt.obj strptime.ob mt.exe -nologo -manifest "editcap.exe.manifest" -outputresource:editcap.exe;1 !ENDIF +# Linking with setargv.obj enables "wildcard expansion" of command-line arguments mergecap.exe : $(LIBS_CHECK) config.h mergecap.obj merge.obj wsgetopt.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res @echo Linking $@ $(LINK) @<< - /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj merge.obj wsgetopt.obj $(mergecap_LIBS) image\mergecap.res + /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj merge.obj wsgetopt.obj $(mergecap_LIBS) setargv.obj image\mergecap.res << !IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "mergecap.exe.manifest" -outputresource:mergecap.exe;1 |