aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2008-12-23 18:56:31 +0000
committerGerald Combs <gerald@wireshark.org>2008-12-23 18:56:31 +0000
commitc30c410fa51598eaaa74ef0cf16530a9c3252f20 (patch)
treedad5a9bdbb9bf2d6b56f881566ba5df8835ebd0c /epan/Makefile.nmake
parent218ec164c67deb33d213f8003915b90192078641 (diff)
Add GeoIP to the Windows build. Fix a remaining geoip_ -> geoip_db_
conversion. svn path=/trunk/; revision=27098
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r--epan/Makefile.nmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 6e4c3782b1..d3b1451008 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -14,7 +14,7 @@ LINK= link
CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \
$(ZLIB_CFLAGS) $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) \
$(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \
- $(SMI_CFLAGS) -D_U_="" $(LOCAL_CFLAGS)
+ $(SMI_CFLAGS) $(GEOIP_CFLAGS) -D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
@@ -38,6 +38,7 @@ libwireshark_LIBS = \
$(GNUTLS_LIBS) \
$(LUA_LIBS) \
$(SMI_LIBS) \
+ $(GEOIP_LIBS) \
..\wsutil\libwsutil.lib \
..\wiretap\wiretap-$(WTAP_VERSION).lib \
!IFDEF ICONV_DIR