aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/nsis
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/nsis')
-rw-r--r--packaging/nsis/Makefile.nmake3
-rw-r--r--packaging/nsis/wireshark.nsi3
2 files changed, 6 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
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index b4cfd05205..90d99a600c 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -410,6 +410,9 @@ File "..\..\epan\wslua\dtd_gen.lua"
!ifdef SMI_DIR
File "..\..\wireshark-gtk2\libsmi-2.dll"
!endif
+!ifdef GEOIP_DIR
+File "..\..\wireshark-gtk2\libGeoIP-1.dll"
+!endif
File "..\..\wireshark-gtk2\COPYING.txt"
File "..\..\wireshark-gtk2\NEWS.txt"
File "..\..\wireshark-gtk2\README.txt"