diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-07-03 15:38:33 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-07-03 13:40:05 +0000 |
| commit | 87cf0433cceb1b4e6e726ca236d11985e4e9f15c (patch) | |
| tree | 07c00d93077db652218c67677e97e619499fbe21 /Makefile.nmake | |
| parent | 16f8ba1bed579344df373bf38fff552ab8baf380 (diff) | |
| download | wireshark-87cf0433cceb1b4e6e726ca236d11985e4e9f15c.tar.gz wireshark-87cf0433cceb1b4e6e726ca236d11985e4e9f15c.tar.bz2 wireshark-87cf0433cceb1b4e6e726ca236d11985e4e9f15c.zip | |
Fix bulding of reordercap
Change-Id: I9898685d20c684c05f505275804d9c6588bba645
Reviewed-on: https://code.wireshark.org/review/2811
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index f302174ba9..6880f44ce0 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -72,6 +72,7 @@ captype_OBJECTS = $(captype_SOURCES:.c=.obj) dftest_OBJECTS = $(dftest_SOURCES:.c=.obj) dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj) randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj) +reordercap_OBJECTS = $(reordercap_SOURCES:.c=.obj) # # psapi.lib see http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx @@ -396,10 +397,10 @@ mergecap.exe : $(LIBS_CHECK) config.h $(mergecap_OBJECTS) wsutil\libwsutil.lib mt.exe -nologo -manifest "mergecap.exe.manifest" -outputresource:mergecap.exe;1 !ENDIF -reordercap.exe : $(LIBS_CHECK) config.h reordercap.obj version_info.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\reordercap.res +reordercap.exe : $(LIBS_CHECK) config.h $(reordercap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\reordercap.res @echo Linking $@ $(LINK) @<< - /OUT:reordercap.exe $(conflags) $(conlibsdll) $(LDFLAGS) reordercap.obj version_info.obj $(reordercap_LIBS) setargv.obj image\reordercap.res + /OUT:reordercap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(reordercap_OBJECTS) $(reordercap_LIBS) setargv.obj image\reordercap.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "reordercap.exe.manifest" -outputresource:reordercap.exe;1 |