diff options
| -rw-r--r-- | Makefile.nmake | 2 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 2 | ||||
| -rw-r--r-- | ui/qt/Wireshark.pro | 3 | ||||
| -rw-r--r-- | wiretap/Makefile.nmake | 2 | ||||
| -rw-r--r-- | wsutil/Makefile.nmake | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 00c5b13515..84f944c4be 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -416,7 +416,7 @@ reordercap.exe : $(LIBS_CHECK) config.h $(reordercap_OBJECTS) wsutil\libwsutil. text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj writecap 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 $(text2pcap_LIBS) image\text2pcap.res + /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj wsutil\ws_version_info.obj $(text2pcap_LIBS) image\text2pcap.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "text2pcap.exe.manifest" -outputresource:text2pcap.exe;1 diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 7ff028a60c..07a886bcac 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -107,7 +107,7 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfil /OUT:libwireshark.dll \ /IMPLIB:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(libwireshark_LIBS) ..\image\libwireshark.res \ - dissectors\register.obj \ + ..\wsutil\ws_version_info.obj dissectors\register.obj \ $(EXTRA_OBJECTS) libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro index c4f3dbcd3f..9113766c0c 100644 --- a/ui/qt/Wireshark.pro +++ b/ui/qt/Wireshark.pro @@ -198,7 +198,8 @@ SOURCES_WS_C = \ ../../filter_files.c \ ../../frame_tvbuff.c \ ../../summary.c \ - ../../sync_pipe_write.c + ../../sync_pipe_write.c \ + ../../ws_version_info.c win32:SOURCES_WS_C += \ ../../ui/win32/console_win32.c \ diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index 58ae255ec1..d4982f311a 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -37,7 +37,7 @@ wiretap-$(WTAP_VERSION).dll : $(OBJECTS) ..\image\wiretap.res /OUT:wiretap-$(WTAP_VERSION).dll \ /IMPLIB:wiretap-$(WTAP_VERSION).lib \ ..\image\wiretap.res \ - $(OBJECTS) $(wiretap_LIBS) + $(OBJECTS) ..\wsutil\ws_version_info.obj $(wiretap_LIBS) RUNLEX = ../tools/runlex.sh diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index 36d06523e4..18d2feaabb 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -32,7 +32,7 @@ OBJECTS = file_util.obj \ popcount.obj \ strptime.obj \ ws_mempbrk_sse42.obj \ - ..\ws_version_info.obj + ws_version_info.obj # For use when making libwsutil.dll libwsutil.lib: libwsutil.dll |