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 /Makefile.nmake | |
| 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 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index c5313977b4..c4cfa8393c 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -900,7 +900,7 @@ process_libs: !ENDIF !IFDEF GEOIP_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . GeoIP-1.4.6-$(WIRESHARK_TARGET_PLATFORM)ws.zip + GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip !ENDIF !IFDEF HHC_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ @@ -973,6 +973,7 @@ clean_setup: rm -r -f AirPcap_Devpack_4_1_0_1622 rm -r -f GeoIP-1.4.5ws rm -r -f GeoIP-1.4.6-win??ws + rm -r -f GeoIP-1.4.8-win??ws rm -r -f WpdPack cd "$(MAKEDIR)" @@ -1192,6 +1193,9 @@ install-all: install-generated-files xcopy "$(SMI_DIR)\share\pibs\*" $(INSTALL_DIR)\snmp\mibs /d xcopy "$(SMI_DIR)\share\yang\*.yang" $(INSTALL_DIR)\snmp\mibs /d !ENDIF +!IFDEF GEOIP_DIR + xcopy "$(GEOIP_DIR)\bin\libGeoip-1.dll" $(INSTALL_DIR) /d +!ENDIF cd $(INSTALL_DIR) peflags --dynamicbase=true --nxcompat=true *.dll peflags --dynamicbase=true --nxcompat=true lib/gtk-2.0/*/engines/*.dll |