!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)" \
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)"
xcopy "$(SMI_DIR)\share\mibs\tubs\*" $(INSTALL_DIR)\snmp\mibs /d
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
#
# Used to map IP addresses to MaxMind GeoIP database entries
#
-GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win32ws\libGeoIP
+GEOIP_PKG=1.4.8
!else
##### Win64 Libraries #####
#
# Used to map IP addresses to MaxMind GeoIP database entries
#
-GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win64ws\libGeoIP
+GEOIP_PKG=1.4.8
!endif
SMI_CONFIG=
!ENDIF
-!IFDEF GEOIP_DIR
+!IFDEF GEOIP_PKG
+GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
GEOIP_CONFIG=^#define HAVE_GEOIP 1
GEOIP_V6_CONFIG=^#define HAVE_GEOIP_V6 1
-GEOIP_CFLAGS=/I$(GEOIP_DIR)
-GEOIP_LIBS=$(GEOIP_DIR)\GeoIP.lib
+GEOIP_CFLAGS=/I$(GEOIP_DIR)/include
+GEOIP_LIBS=$(GEOIP_DIR)\lib\libGeoIP-1.lib
!ELSE
+GEOIP_DIR=
GEOIP_LIBS=
GEOIP_CFLAGS=
GEOIP_CONFIG=
!IFDEF SMI_DIR
/DSMI_DIR=$(SMI_DIR) \
!ENDIF
+!IFDEF GEOIP_DIR
+ /DGEOIP_DIR=$(GEOIP_DIR) \
+!ENDIF
!IFDEF HHC_DIR
/DHHC_DIR="$(HHC_DIR)" \
!ENDIF
!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"
# 32-bit wrapper for win-setup.sh.
-export DOWNLOAD_TAG="2012-05-14"
+export DOWNLOAD_TAG="2012-05-29"
export WIRESHARK_TARGET_PLATFORM="win32"
WIN_SETUP=`echo $0 | sed -e s/win32/win/`
# 64-bit wrapper for win-setup.sh.
-export DOWNLOAD_TAG="2012-05-14"
+export DOWNLOAD_TAG="2012-05-29"
export WIRESHARK_TARGET_PLATFORM="win64"
WIN_SETUP=`echo $0 | sed -e s/win64/win/`