diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-05-29 23:31:00 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-05-29 23:31:00 +0000 |
| commit | 43670460ff8c54a92c841653a758fd48c9e08a01 (patch) | |
| tree | 5a31ac4560c1e1f69353247a30813760543e21f6 /packaging | |
| parent | 86dd3248f65f33d1ad17e3e060710b4e801cb9f7 (diff) | |
Use GeoIP 1.4.8 which includes a DLL instead of a static library.
svn path=/trunk/; revision=42905
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 3 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 3 |
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" |