# Some more informations about the settings in this file, can be found
# in the file README.win32.
-# The current Ethereal version
-VERSION=0.10.10
+# The current Wireshark version
+# VERSION_EXTRA can be used for custom builds, e.g. "-SVN-12345"
+VERSION_MAJOR=1
+VERSION_MINOR=1
+VERSION_MICRO=0
+VERSION_EXTRA=
+VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
#
# The RC_VERSION should be comma-separated, not dot-separated,
# number to be correctly displayed in the explorer properties dialog
# for the executables, and XP's tooltip, rather than 0.0.0.0."
#
-RC_VERSION=0,10,10
+RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO)
# The version of the wiretap library
-WTAP_VERSION=0.1
-RC_WTAP_VERSION=0,1
+WTAP_VERSION=0.3
+RC_WTAP_VERSION=0,3
#
# If you're building with WinPcap 2.3, set WINPCAP_VERSION to 2.3; if
# you're building with WinPcap 3.0, set it to 3.0; if you're building
-# with WinPcap 3.1 alpha, set it to 3.1.
+# with WinPcap 3.1, set it to 3.1.
#
# If you're not building with WinPcap at all, don't set it (comment
# out or remove the line that sets it).
#
-WINPCAP_VERSION=3.0
+WINPCAP_VERSION=3.1
+
+#
+# Directory, where your User's Guide reside, relative to the source dir.
+# (currently unused)
+#
+# If you don't have the User's Guide, comment this line out, so that
+# WIRESHARK_EUG_DIR isn't defined.
+#
+#WIRESHARK_EUG_DIR=docbook/eug_html_chunked
#
# Base directory, where your libraries reside, which needs to be
# compiling the sources. This is only inside this file.
#
-ETHEREAL_LIBS=C:\ethereal-win32-libs
+WIRESHARK_LIBS=C:\wireshark-win32-libs
#
# Current versions of GTK+ 1.3 require GLib 2.0. Earlier versions of
# support them. Upgrade to the current version.
#
GLIB_VERSION=2.0
-GLIB_DIR=$(ETHEREAL_LIBS)\glib
+GLIB_DIR=$(WIRESHARK_LIBS)\glib
#
# This presumes that GTK+ 1.3 packages put header files and libraries
# the pathname of the directory in which the "include" and "lib" directories
# reside.
#
-GTK1_DIR=$(ETHEREAL_LIBS)\gtk+
-GTK2_DIR=$(ETHEREAL_LIBS)\gtk2
+GTK1_DIR=$(WIRESHARK_LIBS)\gtk+
+GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
+
+#
+# If you have gnutls set this to the pathname where the lib and include files
+# are stored.
+# This enable ssl decryption
+#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-win32-msvc\gnutls
# Declare the version of your gtk2 and pango. (MAJOR + MINOR Version number
# but without MICRO version number)
#
#GTK2_INST_VERSION=2.2
#PANGO_INST_VERSION=1.2
-GTK2_INST_VERSION=2.4
-PANGO_INST_VERSION=1.4
+#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
+# Support for GTK 2.8 is currently experimental ...
+#GTK2_INST_VERSION=2.8
+#PANGO_INST_VERSION=1.10
#
# If you have GTK-Wimp, set this to the pathname of the directory in
# If you don't have GTK-Wimp, comment this line out, so that GTK-Wimp isn't
# defined.
#
-GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp
+# Please note: GTK 2.8 (and later?) includes GTK-Wimp
+# (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
#
# If you have Zlib, set this to the pathname of the directory in
# If you don't have Zlib, comment this line out, so that Zlib isn't
# defined.
#
-ZLIB_DIR=$(ETHEREAL_LIBS)\zlib122-dll
+ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123-dll
#
# Set PCAP_DIR to the pathname of the directory in which the WinPcap
# developer's pack resides
#
-PCAP_DIR=$(ETHEREAL_LIBS)\WPdpack
+PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
#
# Set NET_SNMP_DIR to the pathname of the directory in which the
# Net-SNMP include files and library resides.
#
-NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.1.2
+NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.2.2
#
# If you have GNU ADNS, set this to the pathname of the directory in
# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
# isn't defined.
#
-ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-04
+ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05
#
# If you have the PCRE (Perl Compatible Regular Expressions) library,
# If you don't have PCRE, comment this line out, so that PCRE_DIR
# isn't defined.
#
-PCRE_DIR=$(ETHEREAL_LIBS)\pcre-4.4
+PCRE_DIR=$(WIRESHARK_LIBS)\pcre-6.4
#
# If you have the Nettle encryption library, set this to the pathname
# If you don't have Nettle, comment this line out, so that NETTLE_DIR
# isn't defined.
#
-# NETTLE_DIR=$(ETHEREAL_LIBS)\nettle-1.10
+# NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10
+
+#
+# If you have the LUA library, set this to the pathname
+# of the directory in which the LUA package has been extracted.
+#
+# If you don't have LUA, comment this line out, so that LUA_DIR
+# isn't defined.
+#
+LUA_DIR=$(WIRESHARK_LIBS)\lua5.1
#
# Set ICONV_DIR to the pathname of the directory in which the
# ICONV include files and library resides.
#
-ICONV_DIR=$(ETHEREAL_LIBS)\libiconv-1.9.1.bin.woe32
+ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32
#
# Set GETTEXT_DIR to the pathname of the directory in which the
# GETTEXT include files and library resides.
#
-GETTEXT_DIR=$(ETHEREAL_LIBS)\gettext-runtime-0.13.1
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.13.1
# Compiler flags
# /W3 warning level 3 (0 less - 4 most, 1 default)
LOCAL_CFLAGS=/Zi /W3
# Linker flags
-# /DEBUG generate debug info
+# /DEBUG generate debug info
+# /PROFILE generate map file(s) for profiling
LOCAL_LDFLAGS=/DEBUG
# Set PDB_FILE according to your VC++ version
PDB_FILE=vc*.pdb
-# add cygwin binaries to the path
-PATH=$(PATH);c:\cygwin\bin
+# Set up the path to the cygwin binaries
+CYGWIN_PATH=c:\cygwin\bin
-# add some required DLLs to the path
-PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(PATH)
+# Set up the path to some required DLLs
+DLL_PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin
# Set the following commands to find the tools.
# Choose modern style user interface for the installer.
# When using this, make sure you have a supported NSIS
-# version installed. See "packaging\nsis\ethereal.nsi" for details.
+# version installed. See "packaging\nsis\wireshark.nsi" for details.
#
# If you don't want the modern UI (or don't have a recent NSIS version),
# comment this line out, so that MAKENSIS_MODERN_UI isn't defined.
#
#DOXYGEN="C:/program files/doxygen/bin/doxygen.exe"
-# To build compressed html help format .chm from doxygen output.
+# To build compressed html help format .chm and use it as online help format.
# Currently experimental only.
# You will have to download and install the html help compiler from:
#
# http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html
# /hwMicrosoftHTMLHelpDownloads.asp
#
-# Then point HHC to the html help compiler exe.
+# Then point HHC_DIR to the html help dir (where hhc.exe resides).
#
-# The .chm file(s) are not generated by default. You will have to generate the
-# file(s) by calling the Makefile.nmake's target doxygen.chm in the submodules (epan/gk/...).
+# If you don't want the online help (or don't have the tools),
+# comment this line out, so that HHC_DIR isn't defined.
#
-#HHC="C:/Program Files/HTML Help Workshop/hhc.exe"
+#HHC_DIR="C:/Program Files/HTML Help Workshop/"
-# If you don't want to build libethereal.dll, you should comment out the
-# following line
-ENABLE_LIBETHEREAL=USE
+# According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403
+# XCOPY under Windows NT doesn't support the "/Y" flag. This works
+# around that bug.
+# XXX - This apparently doesn't work for some versions of nmake:
+# http://support.microsoft.com/default.aspx?scid=kb;en-us;86814
+# It looks like we'll have to call "set copycmd=/y" before we run xcopy.
+COPYCMD=/y
-!IFDEF ENABLE_LIBETHEREAL
-# Uncomment next line to link plugins with the import library of libethereal.dll
-LINK_PLUGINS_WITH_LIBETHEREAL=USE
+# If you don't want to build libwireshark.dll, you should comment out the
+# following line. (Note: for plugin support this option must stay activated)
+ENABLE_LIBWIRESHARK=USE
+
+!IFDEF ENABLE_LIBWIRESHARK
+# Uncomment next line to link plugins with the import library of libwireshark.dll
+LINK_PLUGINS_WITH_LIBWIRESHARK=USE
!ENDIF
#
# You should not have to change anything below this comment.
# If you do, it's a deficiency in the Makefile.nmake files;
-# either tell ethereal-dev@ethereal.com about it, including
+# either tell wireshark-dev@wireshark.org about it, including
# details of why you had to change it, or fix config.nmake
# and any Makefile.nmake files that need to be changed, and
# send us the patches, along with details of why the change
GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-2.0 \
/I$(GTK2_DIR)\lib\gtk-2.0\include \
/I$(GTK2_DIR)\include\atk-1.0 \
+ /I$(GTK2_DIR)\include\cairo \
/I$(GTK2_DIR)\include\pango-1.0
GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
$(GTK2_DIR)\lib\gdk-win32-2.0.lib \
$(GTK2_DIR)\lib\pango-1.0.lib \
$(GLIB_LIBS)
+# the lib dir of GTK2.6 didn't changed since 2.4.0
+!IF "$(GTK2_INST_VERSION)" == "2.8"
+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
+!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
+!ENDIF
+
+# the lib dir of PANGO1.8 didn't changed since 1.4.0
+!IF "$(PANGO_INST_VERSION)" == "1.10"
+PANGO_LIB_DIR=1.4.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.8"
+PANGO_LIB_DIR=1.4.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.4"
+PANGO_LIB_DIR=1.4.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.2"
+PANGO_LIB_DIR=1.2.0
+!ENDIF
+
+
!IFDEF WINPCAP_VERSION
# Nmake uses carets to escape special characters
WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1
PCAP_FINDALLDEVS_CONFIG=^#define HAVE_PCAP_FINDALLDEVS 1
PCAP_DATALINK_NAME_TO_VAL_CONFIG=^#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1
PCAP_DATALINK_VAL_TO_NAME_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_NAME 1
+!IF "$(WINPCAP_VERSION)" == "3.1"
+PCAP_BREAKLOOP_CONFIG=^#define HAVE_PCAP_BREAKLOOP 1
+!ELSE
+PCAP_BREAKLOOP_CONFIG=
+!ENDIF
WPCAP_CONSTIFIED_CONFIG=^#define WPCAP_CONSTIFIED 1
!ELSE
PCAP_FINDALLDEVS_CONFIG=
PCAP_DATALINK_VAL_TO_NAME_CONFIG=
+PCAP_BREAKLOOP_CONFIG=
WPCAP_CONSTIFIED=
!ENDIF
!ELSE
PCAP_FINDALLDEVS_CONFIG=
PCAP_DATALINK_NAME_TO_VAL_CONFIG=
PCAP_DATALINK_VAL_TO_NAME_CONFIG=
+PCAP_BREAKLOOP_CONFIG=
WPCAP_CONSTIFIED=
!ENDIF
!IFDEF ZLIB_DIR
-PATH=$(ZLIB_DIR);$(PATH)
+ZLIB_PATH=$(ZLIB_DIR)
ZLIB_CFLAGS=/I$(ZLIB_DIR)\include
ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib
# Nmake uses carets to escape special characters
!ENDIF
!IFDEF ADNS_DIR
-PATH=$(ADNS_DIR)\adns_win32\lib;$(PATH)
+ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
ADNS_LIBS=$(ADNS_DIR)\adns_win32\lib\adns_dll.lib
# Nmake uses carets to escape special characters
!ENDIF
!IFDEF PCRE_DIR
-PATH=$(PCRE_DIR)\bin;$(PATH)
+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
NETTLE_CONFIG=
!ENDIF
-!IFDEF ENABLE_LIBETHEREAL
-LIBETHEREAL_CONFIG=^#define HAVE_LIBETHEREALDLL 1
+!IFDEF ENABLE_LIBWIRESHARK
+LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1
!ELSE
-LIBETHEREAL_CONFIG=
+LIBWIRESHARK_CONFIG=
+!ENDIF
+
+!IFDEF GNUTLS_DIR
+GNUTLS_PATH=$(GNUTLS_DIR)
+GNUTLS_CFLAGS=/I$(GNUTLS_DIR)
+GNUTLS_LIBS=$(GNUTLS_DIR)\gnutls.lib user32.lib
+# Nmake uses carets to escape special characters
+GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1
+!else
+GNUTLS_CFLAGS=
+GNUTLS_LIBS=
+GNUTLS_CONFIG=
!ENDIF
+
+!IFDEF LUA_DIR
+LUA_CFLAGS=/I$(LUA_DIR)\include
+LUA_LIBS=$(LUA_DIR)\lib\vc6\lua5.1.lib
+# Nmake uses carets to escape special characters
+LUA_CONFIG=^#define HAVE_LUA 1
+LUA_VERSION=^#define HAVE_LUA_5_1 1
+!else
+LUA_CFLAGS=
+LUA_LIBS=
+LUA_CONFIG=
+!ENDIF
+
+# Construct the path
+PATH=$(PATH);$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH)
git.samba.org / obnox / wireshark / wip.git / blobdiff