aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/nsis/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-05-29 23:31:00 +0000
committerGerald Combs <gerald@wireshark.org>2012-05-29 23:31:00 +0000
commit43670460ff8c54a92c841653a758fd48c9e08a01 (patch)
tree5a31ac4560c1e1f69353247a30813760543e21f6 /packaging/nsis/Makefile.nmake
parent86dd3248f65f33d1ad17e3e060710b4e801cb9f7 (diff)
Use GeoIP 1.4.8 which includes a DLL instead of a static library.
svn path=/trunk/; revision=42905
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
-rw-r--r--packaging/nsis/Makefile.nmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 2ccbab6bd6..6d3f2f8f0a 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -185,6 +185,9 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
!IFDEF SMI_DIR
/DSMI_DIR=$(SMI_DIR) \
!ENDIF
+!IFDEF GEOIP_DIR
+ /DGEOIP_DIR=$(GEOIP_DIR) \
+!ENDIF
!IFDEF HHC_DIR
/DHHC_DIR="$(HHC_DIR)" \
!ENDIF