aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2008-08-07 21:41:48 +0000
committerGerald Combs <gerald@wireshark.org>2008-08-07 21:41:48 +0000
commit021a926793686bcde277cbc7797c91b129befcb2 (patch)
tree5f4f4243098a27485a7cfafb8b317bb0eed0f83e /epan/Makefile.nmake
parent91407025b7f10e7e59b4311aaf4350ba39b35c2f (diff)
Add support for the c-ares asynchronous DNS resolution library to the
Windows build. Add support for async IPv6 lookups. Update the ADNS code slightly. This is not supported (yet) on the UNIX side. svn path=/trunk/; revision=25953
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r--epan/Makefile.nmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index c468b65299..33b194e41b 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -12,7 +12,8 @@ include Makefile.common
LINK= link
CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \
- $(ZLIB_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \
+ $(ZLIB_CFLAGS) $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) \
+ $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \
$(SMI_CFLAGS) -D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
@@ -28,6 +29,7 @@ WSLUA_DIR=
# For use when making libwireshark.dll
libwireshark_LIBS = \
$(GLIB_LIBS) \
+ $(C_ARES_LIBS) \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
$(KFW_LIBS) \
@@ -108,8 +110,8 @@ libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) crypt ftypes dfilter $(WS
clean-local:
rm -f $(LIBWIRESHARK_OBJECTS) $(EXTRA_OBJECTS) \
- libwireshark.lib libwireshark.dll libwireshark.dll.manifest libwireshark.exp libwireshark.pdb \
- vc60.pdb vc80.pdb doxygen.cfg html/*.* \
+ libwireshark.lib libwireshark.dll libwireshark.dll.manifest libwireshark.exp \
+ *.pdb doxygen.cfg html/*.* \
exntest.obj exntest.exe reassemble_test.obj reassemble_test.exe tvbtest.obj tvbtest.exe
if exist html rmdir html