# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
VERSION_MAJOR=0
VERSION_MINOR=99
-VERSION_MICRO=4
+VERSION_MICRO=5
# It's recommended to change VERSION_EXTRA for your own custom builds
# e.g. "-SVN-12345"
VERSION_EXTRA=
# The version of the wiretap library (recommended: leave unchanged)
WTAP_VERSION_MAJOR=0
WTAP_VERSION_MINOR=3
+WTAP_VERSION_MICRO=1
# (MAJOR + MINOR Version number but without MICRO version number)
# These macros are used by the nsis installer script and by the setup target.
#
-#GTK2_INST_VERSION=2.2
-#PANGO_INST_VERSION=1.2
-#GTK2_INST_VERSION=2.4
-#PANGO_INST_VERSION=1.4
# GTK 2.6 is the mainline since Ethereal 0.10.14
-GTK2_INST_VERSION=2.6
-PANGO_INST_VERSION=1.8
+#GTK2_INST_VERSION=2.6
+#PANGO_INST_VERSION=1.8
# Support for GTK 2.8 is currently experimental ...
-#GTK2_INST_VERSION=2.8
-#PANGO_INST_VERSION=1.10
+GTK2_INST_VERSION=2.8
+PANGO_INST_VERSION=1.12
#
# If you have GTK-Wimp, set this to the pathname of the directory in
# (in this case these GTK-Wimp related settings will have no effect)
#
GTK_WIMP_DIR=$(WIRESHARK_LIBS)\gtk-wimp\gtk-wimp-0.7.0-bin
-GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
#
# Optional: WinPcap developer's pack to capture network traffic.
#
# The WinPcap developer's pack version Wireshark is build with.
#
-# If you're building with WinPcap 3.0, set WINPCAP_VERSION to 3.0;
-# if you're building with WinPcap 3.1, set WINPCAP_VERSION to 3.1.
-# XXX - what to set for 4.0 beta 1?
-#
# If you don't have the WPdpack, comment this line out, so that
# WINPCAP_VERSION isn't defined.
#
+#WINPCAP_VERSION=3.0
WINPCAP_VERSION=3.1
+# XXX - what to set for 4.0 beta 1?
#
# If you have the WinPcap developer's pack, set this to the directory
# in which the WinPcap developer's pack resides.
# If you don't have GNUTLS, comment this line out, so that GNUTLS_DIR
# isn't defined.
#
-GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.5.0-1
+GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.5.1-1
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
# PORTAUDIO_DIR isn't defined.
#
PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
+#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19
-# If the PORTAUDIO library is used this line must be uncommented if v18
-# is used. V18 uses API version 1 and v19 API version 2
+#
+# Version number of PortAudio
#
-PORTAUDIO_API_CONFIG=^#define PORTAUDIO_API_1 1
-
+PORTAUDIO_VERSION=18
+#PORTAUDIO_VERSION=19
#
# Mandatory for GTK >= 2: Iconv
# Set GETTEXT_DIR to the directory in which the
# GETTEXT include files and library resides.
#
-GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.13.1
+#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.13.1
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
+
+#
+# Optional: AirPcap developer's pack to capture wireless network traffic
+# incl. 802.11 management frames.
+#
+# If you have the AirPcap developer's pack, set this to the directory
+# in which the AirPcap developer's pack resides.
+#
+# 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
CYGWIN_PATH=c:\cygwin\bin
#
-# Optional: Directory, where your User's Guide reside,
-# relative to the source dir. (currently experimental)
+# Optional: Use the User's Guide as the online help system
+# (currently experimental).
#
# If you don't have the User's Guide, comment this line out, so that
-# WIRESHARK_EUG_DIR isn't defined.
+# ENABLE_WSUG isn't defined.
#
-#WIRESHARK_EUG_DIR=docbook/eug_html_chunked
+#ENABLE_WSUG=USE
#
# According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403
# following line. (Note: for plugin support this option must stay activated)
ENABLE_LIBWIRESHARK=USE
+#
+# install (debug) directory for Wireshark GTK1 version (relative to your source dir)
+INSTALL1_DIR=wireshark-gtk1
+
+#
+# install (debug) directory for Wireshark GTK2 version (relative to your source dir)
+INSTALL2_DIR=wireshark-gtk2
+
##############################################################################
VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO)
-WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR)
-RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR)
+WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO)
+RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)
GLIB_CFLAGS=/I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
GTK2_LIB_DIR=2.4.0
NEED_LIBPNG_DLL=USE
NEED_CAIRO_DLL=USE
-GTK_WIMP_DIR=$(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines
-GTK_THEME_DIR=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0
+GTK_WIMP_DIR=DUMMY_TO_USE_WIMP
+GTK_WIMP_DLLSRC_DIR=$(GTK2_DIR)\lib\gtk-2.0\2.4.0\engines
+GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.4.0\engines
+GTK_WIMP_RCSRC_DIR=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0
+GTK_WIMP_RCDST_DIR=etc\gtk-2.0
!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
GTK2_LIB_DIR=2.4.0
-!ELSEIF "$(GTK2_INST_VERSION)" == "2.4"
-GTK2_LIB_DIR=2.4.0
-!ELSEIF "$(GTK2_INST_VERSION)" == "2.2"
-GTK2_LIB_DIR=2.2.0
+GTK_WIMP_DLLSRC_DIR=$(GTK_WIMP_DIR)
+GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.4.0\engines
+GTK_WIMP_RCSRC_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
+GTK_WIMP_RCDST_DIR=share\themes\Default\gtk-2.0
+GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
!ENDIF
-# the lib dir of PANGO1.8 didn't changed since 1.4.0
-!IF "$(PANGO_INST_VERSION)" == "1.10"
+# the lib dir of PANGO changed in 1.12
+!IF "$(PANGO_INST_VERSION)" == "1.12"
+PANGO_LIB_DIR=1.5.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.10"
PANGO_LIB_DIR=1.4.0
!ELSEIF "$(PANGO_INST_VERSION)" == "1.8"
PANGO_LIB_DIR=1.4.0
PANGO_LIB_DIR=1.2.0
!ENDIF
-# Enable / disable AirPcap support
-
-# AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1
+!IFDEF AIRPCAP_DIR
+AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1
+!ELSE
AIRPCAP_CONFIG=
+!ENDIF
-!IFDEF WINPCAP_VERSION
+!IFDEF PCAP_DIR
# Nmake uses carets to escape special characters
WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1
!IF "$(WINPCAP_VERSION)" == "3.0" || "$(WINPCAP_VERSION)" == "3.1"
WPCAP_CONSTIFIED_CONFIG=^#define WPCAP_CONSTIFIED 1
!ELSE
PCAP_FINDALLDEVS_CONFIG=
+PCAP_DATALINK_NAME_TO_VAL_CONFIG=
PCAP_DATALINK_VAL_TO_NAME_CONFIG=
PCAP_BREAKLOOP_CONFIG=
WPCAP_CONSTIFIED=
ZLIB_CONFIG=
!ENDIF
+!IFDEF NET_SNMP_DIR
+NET_SNMP_CFLAGS=/I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32
+NET_SNMP_LIBS=$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib
+# Nmake uses carets to escape special characters
+NET_SNMP_CONFIG=^#define HAVE_NET_SNMP 1
+SOME_SNMP_CONFIG=^#define HAVE_SOME_SNMP 1
+!else
+NET_SNMP_CFLAGS=
+NET_SNMP_LIBS=
+NET_SNMP_CONFIG=
+SOME_SNMP_CONFIG=
+!ENDIF
+
!IFDEF ADNS_DIR
ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
NETTLE_CONFIG=
!ENDIF
-!IFDEF ENABLE_LIBWIRESHARK
-LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1
-!ELSE
-LIBWIRESHARK_CONFIG=
-!ENDIF
-
!IFDEF GNUTLS_DIR
GNUTLS_PATH=$(GNUTLS_DIR)
GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include
!IFDEF LUA_DIR
LUA_CFLAGS=/I$(LUA_DIR)\include
-LUA_LIBS=$(LUA_DIR)\lib\vc6\lua5.1.lib
+LUA_LIBS=$(LUA_DIR)\lib\dll\lua5.1.lib
# Nmake uses carets to escape special characters
LUA_CONFIG=^#define HAVE_LUA 1
LUA_VERSION=^#define HAVE_LUA_5_1 1
!IFDEF PORTAUDIO_DIR
# Nmake uses carets to escape special characters
PORTAUDIO_CONFIG=^#define HAVE_LIBPORTAUDIO 1
+!IF "$(PORTAUDIO_VERSION)" == "18"
+# V18 uses API version 1 and v19 API version 2
+PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\pa_common
+PORTAUDIO_API_CONFIG=^#define PORTAUDIO_API_1 1
+!ELSE
+PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\include /I$(PORTAUDIO_DIR)\src\common
+!ENDIF
+
!else
+PORTAUDIO_CFLAGS=
PORTAUDIO_CONFIG=
!ENDIF
+!IFDEF HHC_DIR
+HHC_CFLAGS=/I$(HHC_DIR)\include -DHHC_DIR
+HHC_LIBS=$(HHC_DIR)\lib\htmlhelp.lib
+!ELSE
+HHC_CFLAGS=
+HHC_LIBS=
+!ENDIF
+
+!IFDEF ENABLE_LIBWIRESHARK
+LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1
+!ELSE
+LIBWIRESHARK_CONFIG=
+!ENDIF
+
+!IFDEF ENABLE_WSUG
+WSUG_CFLAGS=-DENABLE_WSUG
+!ELSE
+WSUG_CFLAGS=
+!ENDIF
+
# Construct the path
PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
git.samba.org / obnox / wireshark / wip.git / blobdiff