##### Versions #####
-# The current Wireshark version
-# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
+# The SVN revision of our build. Updated by make-version.pl
+SVN_REVISION=0
+
+# The current Wireshark version. Recommended: Leave unchanged.
+# Updated by make-version.pl
VERSION_MAJOR=1
-VERSION_MINOR=5
+VERSION_MINOR=7
VERSION_MICRO=1
-VERSION_BUILD=0
-# It's recommended to change VERSION_EXTRA for your own custom builds
-# e.g. "-SVN-12345"
-VERSION_EXTRA=
+VERSION_BUILD=$(SVN_REVISION)
-# The version of the wiretap library (recommended: leave unchanged)
-WTAP_VERSION_MAJOR=0
-WTAP_VERSION_MINOR=3
-WTAP_VERSION_MICRO=1
+# Local build information. Recommended: Unique string for your
+# environment, e.g. "-JackStackBarbecue". Updated by make-version.pl
+VERSION_EXTRA=
+# The version of the wiretap library. Recommended: Leave unchanged.
+WTAP_VERSION_MAJOR=$(VERSION_MAJOR)
+WTAP_VERSION_MINOR=$(VERSION_MINOR)
+WTAP_VERSION_MICRO=0
##### Directories #####
#
# Base directory, where your libraries reside, which are needed to
# compile the sources. This setting is used only inside this file.
+# This can be defined in the system environment.
#
-WIRESHARK_LIBS=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
+!IFNDEF WIRESHARK_LIB_DIR
+WIRESHARK_LIB_DIR=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
+!ENDIF
#
# Base directory, where your programs reside.
# If you don't have NASM, comment this line out, so that NASM
# isn't defined.
#
-NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
+NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe
#
# Optional: the Python library enables scripting support.
# Python version CRT (32-bit) CRT (64-bit)
# 2.4.4 7.1 ?
# 2.6.1 9.0 ?
-# 2.6.2 9.0
+# 2.6.2 ? 9.0
+# 2.7.1 9.0 9.0
+# 3.2.2 9.0 9.0
#
# If you versions of Python and Visual C++ use different CRTs
# comment this out.
PATH=$(PYTHON_DIR);$(PATH)
!ENDIF
+#### Save files as pcap-ng by default. Comment out to use pcap instead. ####
+PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1
+
+##### To Use packet editor uncomment this line ####
+### Warning Experimental - work in progress
+#WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1
+
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
##### Win32 Libraries #####
#
#
GLIB_VERSION=2.0
-##### To use the old packet list comment out this line ####
-NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
-
#
# Mandatory: GLib, GTK & related library settings
#
# If you want building with GTK+, set GTK_DIR to the pathname of the
# directory in which the "include" and "lib" directories reside.
#
-GTK_DIR=$(WIRESHARK_LIBS)\gtk2
+GTK_DIR=$(WIRESHARK_LIB_DIR)\gtk2
# These macros are used by the nsis installer script and by the install target.
PNG_DLL=libpng14-14.dll
FREETYPE_DLL=freetype6.dll
EXPAT_DLL=libexpat-1.dll
INTL_DLL=intl.dll
# This macro is used by the setup target.
-GTK_PKG=2.16.6-20100912
-#GTK_PKG=2.22.0-20101016
+#GTK_PKG=2.16.6-20100912
+GTK_PKG=2.22.1-20101227
#
# Mandatory: Version numbers of GTK and pango.
# (MAJOR + MINOR Version number but without MICRO version number)
# These macros are used by the nsis installer script and by the setup target.
#
-GTK_INST_VERSION=2.16
-#GTK_INST_VERSION=2.22
+#GTK_INST_VERSION=2.16
+GTK_INST_VERSION=2.22
#
# Optional: WinPcap developer's pack to capture network traffic.
# If you don't have the WPdpack, comment this line out, so that
# PCAP_DIR isn't defined.
#
-PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
PCAP_VERSION=4_1_2
#
# If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
# defined.
-#
-ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
+# EXperimental only use zlib 1.2.5 on win32 for now
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
#
# Optional: the ADNS library enables asynchronous (nonblocking) DNS
#
# If C_ARES_DIR is defined below, it will override this setting.
#
-#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+#ADNS_DIR=$(WIRESHARK_LIB_DIR)\adns-1.0-win32-05ws
#
# Optional: the c-ares library enables asynchronous (nonblocking) DNS
#
C_ARES_PKG=1.7.1
-#
-# Optional: the PCRE (Perl Compatible Regular Expressions) library
-# enables regular expressions for display filters.
-#
-# If you have the PCRE library, set this to the directory in which
-# the GNUWIN32 pcre-lib package is stored.
-#
-# If you don't have PCRE, comment this line out, so that PCRE_DIR
-# isn't defined.
-#
-#PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
-
#
# Optional: the GNUTLS library enables ssl decryption.
#
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.8.5-4.12
+GNUTLS_PKG=2.10.3-1.11
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
# If you don't have KFW, comment this line out, so that KFW_DIR
# isn't defined.
#
-KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-i386-ws-vc6
+KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6
#
# Optional: the Nettle library enables ??? decryption.
# If you don't have Nettle, comment this line out, so that NETTLE_DIR
# isn't defined.
#
-# NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10
+# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10
#
# Optional: the LUA library enables scripting support.
# isn't defined.
#
LUA_DIST=5_1_4_Win32_dll6
-LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
+LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4
#
# Optional: the PORTAUDIO library enables audio output for RTP streams.
# If you don't have PORTAUDIO, comment this line out, so that
# PORTAUDIO_DIR isn't defined.
#
-#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
-PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
+#PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v18_1
+PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v19_2
#
# Version number of PortAudio
# If you don't have the AirPcap developer's pack, comment this line out,
# so that AIRPCAP_DIR isn't defined.
#
-AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
+AIRPCAP_DIR=$(WIRESHARK_LIB_DIR)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
#
# Optional: LIBSMI, System Management Interface
#
# Used for oid-name resolution for SNMP and other protocols
#
-SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
+SMI_PKG=svn-40773
#
# Optional: GeoIP, IP address database lookups
# However, the Microsoft Platform SDK for Windows Server 2003 R2 provides
# these definitions. The SDK's SetEnv.bat script defines INETSDK.
!IF "$(MSVC_VARIANT)" != "MSVC6" || DEFINED(INETSDK)
-GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.6-win32ws\libGeoIP
+GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win32ws\libGeoIP
!ENDIF
!else
#
GLIB_VERSION=2.0
-##### To use the old packet list comment out this line ####
-NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
-
#
# Mandatory: GLib, GTK & related library settings
#
# If you want building with GTK+, set GTK_DIR to the pathname of the
# directory in which the "include" and "lib" directories reside.
#
-GTK_DIR=$(WIRESHARK_LIBS)\gtk2
+GTK_DIR=$(WIRESHARK_LIB_DIR)\gtk2
# These macros are used by the nsis installer script and by the install target.
PNG_DLL=libpng14-14.dll
#TIFF_DLL=libtiff-3.dll
INTL_DLL=libintl-8.dll
# These macros are used by the setup target.
-GTK_PKG=2.16.6-20100912
-#GTK_PKG=2.22.0-20101016
+#GTK_PKG=2.16.6-20100912
+GTK_PKG=2.22.1-20101229
#
# Mandatory: Version numbers of GTK and pango.
# (MAJOR + MINOR Version number but without MICRO version number)
# These macros are used by the nsis installer script and by the setup target.
#
-GTK_INST_VERSION=2.16
-#GTK_INST_VERSION=2.22
+#GTK_INST_VERSION=2.16
+GTK_INST_VERSION=2.22
#
# Optional: WinPcap developer's pack to capture network traffic.
# If you don't have the WPdpack, comment this line out, so that
# PCAP_DIR isn't defined.
#
-PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
PCAP_VERSION=4_1_2
# If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
# defined.
#
-ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
#
# Optional: the ADNS library enables asynchronous (nonblocking) DNS
#
# If C_ARES_DIR is defined below, it will override this setting.
#
-#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+#ADNS_DIR=$(WIRESHARK_LIB_DIR)\adns-1.0-win32-05ws
#
# Optional: the c-ares library enables asynchronous (nonblocking) DNS
#
C_ARES_PKG=1.7.1
-#
-# Optional: the PCRE (Perl Compatible Regular Expressions) library
-# enables regular expressions for display filters.
-#
-# If you have the PCRE library, set this to the directory in which
-# the GNUWIN32 pcre-lib package is stored.
-#
-# If you don't have PCRE, comment this line out, so that PCRE_DIR
-# isn't defined.
-#
-#PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
-
#
# Optional: the GNUTLS library enables ssl decryption.
#
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.8.5-3.16
+GNUTLS_PKG=2.10.3-1.7
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
# If you don't have KFW, comment this line out, so that KFW_DIR
# isn't defined.
#
-#KFW_DIR=$(WIRESHARK_LIBS)\kfw-3.2.2-ws1
+#KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3.2.2-ws1
#
# Optional: the Nettle library enables ??? decryption.
# If you don't have Nettle, comment this line out, so that NETTLE_DIR
# isn't defined.
#
-# NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10
+# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10
#
# Optional: the LUA library enables scripting support.
# isn't defined.
#
LUA_DIST=5_1_4_Win64_dll9
-LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
+LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4
#
# Optional: the PORTAUDIO library enables audio output for RTP streams.
# If you don't have PORTAUDIO, comment this line out, so that
# PORTAUDIO_DIR isn't defined.
#
-#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
-PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
+#PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v18_1
+PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v19_2
#
# Version number of PortAudio
# If you don't have the AirPcap developer's pack, comment this line out,
# so that AIRPCAP_DIR isn't defined.
#
-AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
+AIRPCAP_DIR=$(WIRESHARK_LIB_DIR)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
#
# Optional: LIBSMI, System Management Interface
#
# Used for oid-name resolution for SNMP and other protocols
#
-#SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
+SMI_PKG=svn-40773
#
# Optional: GeoIP, IP address database lookups
#
# Used to map IP addresses to MaxMind GeoIP database entries
#
-GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.6-win64ws\libGeoIP
+GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win64ws\libGeoIP
!endif
# comment this line out, so that UPX isn't defined.
#
-UPX=$(WIRESHARK_LIBS)\upx303w\upx.exe
+UPX=$(WIRESHARK_LIB_DIR)\upx303w\upx.exe
##### Flags, PATHs and Miscellaneous #####
DLL_LDFLAGS = /MANIFEST:no
!ENDIF
+# Enable Safe Exception Handler.
+# http://msdn.microsoft.com/en-us/magazine/cc337897.aspx
+!IF $(MSC_VER_REQUIRED) >= 1300
+LOCAL_CFLAGS= $(LOCAL_CFLAGS) /GS
+!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
+LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /SafeSEH
+!ENDIF
+!ENDIF
+
# Enable ASLR. Requires VS2008 or later.
# http://blogs.msdn.com/b/vcblog/archive/2009/05/21/dynamicbase-and-nxcompat.aspx
-# DEP is handled in init_process_policies()
+# DEP (/NXCompat) is handled in init_process_policies() via SetProcessDEPPolicy.
# ASLR http://msdn.microsoft.com/en-us/library/bb384887.aspx
!IF $(MSC_VER_REQUIRED) >= 1500
-LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE
+LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE /FIXED:no
!ENDIF
PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) $(DLL_LDFLAGS)
!ELSEIF "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
# We're not creating portable packages and therefore don't have to worry about
# "deploying using xcopy"
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2002"
# you probably need to tweak this directory if you don't use the professional edition!
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE"
# you need to download the redistributable package vcredist_x86.exe from Microsoft first,
# and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008"
MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.*
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE"
# you need to download the redistributable package vcredist_x86.exe from Microsoft first,
# and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010"
MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.*
# You may want to install the FOP hyphenation patterns from
# http://offo.sourceforge.net/hyphenation/
!IFNDEF FOP
-FOP=fop-0.95\fop.bat
+FOP=fop-1.0\fop.bat
!ENDIF
# Additional options to fop.
VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_BUILD)
+PRODUCT_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).$(VERSION_BUILD)
WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO)
RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)
# GLib
GLIB_CFLAGS=/I$(GTK_DIR)\include\glib-$(GLIB_VERSION) \
- /I$(GTK_DIR)\lib\glib-$(GLIB_VERSION)\include
+ /I$(GTK_DIR)\lib\glib-$(GLIB_VERSION)\include \
+ -DG_DISABLE_DEPRECATED
GLIB_LIBS=$(GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \
$(GTK_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
$(GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib
/I$(GTK_DIR)\lib\gtk-2.0\include \
/I$(GTK_DIR)\include\atk-1.0 \
/I$(GTK_DIR)\include\cairo \
- /I$(GTK_DIR)\include\pango-1.0
+ /I$(GTK_DIR)\include\pango-1.0 \
+ -DGTK_DISABLE_SINGLE_INCLUDES \
+ -DGTK_DISABLE_DEPRECATED \
+ -DGSEAL_ENABLE
GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
$(GTK_DIR)\lib\gdk-win32-2.0.lib \
$(GTK_DIR)\lib\gdk_pixbuf-2.0.lib \
+ $(GTK_DIR)\lib\cairo.lib \
$(GTK_DIR)\lib\pango-1.0.lib \
+ $(GTK_DIR)\lib\pangocairo-1.0.lib \
$(GLIB_LIBS)
# 2.18 was no good(Theming problem)
!IFDEF AIRPCAP_DIR
AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1
-AIRPDCAP_CONFIG=^#define HAVE_AIRPDCAP 1
#AIRPCAP_CFLAGS=/I$(AIRPCAP_DIR)\include
!ELSE
AIRPCAP_CONFIG=
-AIRPDCAP_CONFIG=
!ENDIF
!IFDEF PCAP_DIR
ZLIB_DLL=$(ZLIB_DIR)\zlib1.dll
# Nmake uses carets to escape special characters
ZLIB_CONFIG=^#define HAVE_LIBZ 1
-ZLIB_GZCLEARERR_CONFIG=^#define HAVE_GZCLEARERR 1
!else
ZLIB_CFLAGS=
ZLIB_LIBS=
!IFDEF C_ARES_PKG
!UNDEF ADNS_DIR
-C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
+C_ARES_DIR=$(WIRESHARK_LIB_DIR)\c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
C_ARES_CFLAGS=/I$(C_ARES_DIR)/include
C_ARES_LIBS=$(C_ARES_DIR)\lib\libcares-2.lib
C_ARES_DLL=$(C_ARES_DIR)\bin\libcares-2.dll
!IFDEF ADNS_DIR
ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
-ADNS_LIBS=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.lib
-ADNS_DLL=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.dll
+ADNS_LIBS=$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns\adns_dll.lib
+ADNS_DLL=$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns\adns_dll.dll
# Nmake uses carets to escape special characters
ADNS_CONFIG=^#define HAVE_GNU_ADNS 1
!else
KFW_CONFIG=
!ENDIF
-!IFDEF PCRE_DIR
-PCRE_PATH=$(PCRE_DIR)\bin
-PCRE_CFLAGS=/I$(PCRE_DIR)\include
-PCRE_LIBS=$(PCRE_DIR)\lib\pcre.lib
-# Nmake uses carets to escape special characters
-PCRE_CONFIG=^#define HAVE_LIBPCRE 1
-!else
-PCRE_CFLAGS=
-PCRE_LIBS=
-PCRE_CONFIG=
-!ENDIF
-
!IFDEF NETTLE_DIR
NETTLE_CFLAGS=/I$(NETTLE_DIR)
NETTLE_LIBS=$(NETTLE_DIR)\libnettle.lib
!ENDIF
!IFDEF GNUTLS_PKG
-GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
+GNUTLS_DIR=$(WIRESHARK_LIB_DIR)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
GNUTLS_PATH=$(GNUTLS_DIR)
# /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash
GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL
HHC_LIBS=
!ENDIF
-!IFDEF SMI_DIR
+!IFDEF SMI_PKG
+SMI_DIR=$(WIRESHARK_LIB_DIR)\libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
SMI_CONFIG=^#define HAVE_LIBSMI 1
SMI_CFLAGS=/I$(SMI_DIR)\include
-SMI_LIBS=$(SMI_DIR)\lib\smi.lib
+SMI_LIBS=$(SMI_DIR)\lib\libsmi-2.lib
!ELSE
+SMI_DIR=
SMI_LIBS=
SMI_CFLAGS=
SMI_CONFIG=
!IFDEF GEOIP_DIR
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
!ELSE
-GeoIP_LIBS=
-GeoIP_CFLAGS=
-GeoIP_CONFIG=
+GEOIP_LIBS=
+GEOIP_CFLAGS=
+GEOIP_CONFIG=
+GEOIP_V6_CONFIG=
!ENDIF
!IFDEF ENABLE_LIBWIRESHARK