diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-07-03 14:18:33 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-07-03 12:22:11 +0000 |
| commit | 16574232ccabbeef5a1a1f92f1ad64fde4f655ab (patch) | |
| tree | e518b4d3877f57e3203391ccb211c3ae71ee53fe /Makefile.nmake | |
| parent | 470994d90260f4a6ee191031344e1f98314995e9 (diff) | |
Try to fix the build by adding version_info.obj to the link stage of
text2pcap and in both lines for mergecap.
Follow up of https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1a165b9be8a122ee1d5c0a60ca441d2c9198b3fd
Change-Id: I4b44965604eec92415b8bb6e9267dadbb2937f7a
Reviewed-on: https://code.wireshark.org/review/2807
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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 5825a2295f..f302174ba9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -396,10 +396,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 wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\reordercap.res +reordercap.exe : $(LIBS_CHECK) config.h reordercap.obj version_info.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\reordercap.res @echo Linking $@ $(LINK) @<< - /OUT:reordercap.exe $(conflags) $(conlibsdll) $(LDFLAGS) reordercap.obj $(reordercap_LIBS) setargv.obj image\reordercap.res + /OUT:reordercap.exe $(conflags) $(conlibsdll) $(LDFLAGS) reordercap.obj version_info.obj $(reordercap_LIBS) setargv.obj image\reordercap.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "reordercap.exe.manifest" -outputresource:reordercap.exe;1 @@ -408,7 +408,7 @@ reordercap.exe : $(LIBS_CHECK) config.h reordercap.obj wsutil\libwsutil.lib wir text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj pcapio.obj version_info.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res @echo Linking $@ $(LINK) @<< - /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj pcapio.obj $(text2pcap_LIBS) image\text2pcap.res + /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj pcapio.obj version_info.obj $(text2pcap_LIBS) image\text2pcap.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "text2pcap.exe.manifest" -outputresource:text2pcap.exe;1 |