diff options
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 7bb7b03acf..93778e4129 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -45,6 +45,7 @@ EXTRA_OBJECTS = \ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib shell32.lib comctl32.lib \ $(HHC_LIBS) \ + wsutil\libwsutil.lib \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -53,7 +54,6 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\crypt\airpdcap.lib \ epan\dfilter\dfilter.lib \ epan\ftypes\ftypes.lib \ - wsutil\libwsutil.lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ $(ZLIB_LIBS) \ @@ -63,6 +63,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ + wsutil\libwsutil.lib \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -71,7 +72,6 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\crypt\airpdcap.lib \ epan\dfilter\dfilter.lib \ epan\ftypes\ftypes.lib \ - wsutil\libwsutil.lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ $(ZLIB_LIBS) \ @@ -81,6 +81,7 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ + wsutil\libwsutil.lib \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -89,7 +90,6 @@ rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\crypt\airpdcap.lib \ epan\dfilter\dfilter.lib \ epan\ftypes\ftypes.lib \ - wsutil\libwsutil.lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ $(ZLIB_LIBS) \ @@ -124,13 +124,13 @@ dumpcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ + wsutil\libwsutil.lib \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE epan\dissectors\dissectors.lib \ epan\wireshark.lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ - wsutil\libwsutil.lib \ $(ADNS_LIBS) \ $(PCRE_LIBS) \ $(ZLIB_LIBS) \ @@ -509,7 +509,7 @@ image:: # Unfortunately: # - we need to "patch" adns_dll.rep and adns_dll.rc (at least for MSVC2005EE) # - on MSVC6 we can't easily rebuild, because iphlpapi.h is needed -# +# $(ADNS_DLL): !IF "$(MSVC_VARIANT)" == "MSVC6" if not exist $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns @@ -1051,7 +1051,7 @@ checkapi_local: # $(TSHARK_TAP_SRC) # EXTRA_wireshark_SOURCES -checkapi: +checkapi: # checkapi_local cd wiretap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi |