# $Id$
# Some more informations about the settings in this file, can be found
-# in the file README.win32.
+# in the file README.win32 and the Developer's Guide (available online).
-# The current Ethereal version
-# VERSION_EXTRA can be used for custom builds, e.g. "-SVN-12345"
-VERSION_MAJOR=1
-VERSION_MINOR=1
-VERSION_MICRO=0
+
+
+##### Versions #####
+
+# The current Wireshark version
+# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
+VERSION_MAJOR=0
+VERSION_MINOR=99
+VERSION_MICRO=6
+# It's recommended to change VERSION_EXTRA for your own custom builds
+# e.g. "-SVN-12345"
VERSION_EXTRA=
-VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
-#
-# The RC_VERSION should be comma-separated, not dot-separated,
-# as per Graham Bloice's message in
-#
-# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html
-#
-# "The RC_VERSION variable in config.nmake should be comma separated.
-# This allows the resources to be built correctly and the version
-# 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=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO)
+# The version of the wiretap library (recommended: leave unchanged)
+WTAP_VERSION_MAJOR=0
+WTAP_VERSION_MINOR=3
+WTAP_VERSION_MICRO=1
-# The version of the wiretap library
-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, 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.1
+
+##### Directories #####
#
-# Directory, where your User's Guide reside, relative to the source dir.
-# (currently unused)
+# Base directory, where your libraries reside, which are needed to
+# compile the sources. This setting is used only inside this file.
#
-# If you don't have the User's Guide, comment this line out, so that
-# ETHEREAL_EUG_DIR isn't defined.
-#
-#ETHEREAL_EUG_DIR=docbook/eug_html_chunked
+WIRESHARK_LIBS=C:\wireshark-win32-libs
#
-# Base directory, where your libraries reside, which needs to be
-# compiling the sources. This is only inside this file.
+# Base directory, where your programs reside.
+# This setting is used only inside this file.
#
-ETHEREAL_LIBS=C:\ethereal-win32-libs
+PROGRAM_FILES=C:/Program Files
+
+
+
+##### Microsoft Visual C / Studio Variant #####
+# for the different Studios, see: http://en.wikipedia.org/wiki/Microsoft_Visual_Studio
+# only one of the following MSVC_VARIANT settings should be used
+# BTW: The "Microsoft Visual C++ Toolkit 2003" DOESN'T WORK for WS!
+
+# "Microsoft Visual Studio 6.0" - RECOMMENDED
+# Visual C++ 6.0, _MSC_VER 1200, msvcrt.dll (version 6)
+MSVC_VARIANT=MSVC6
+
+# "Microsoft Visual Studio .NET (2002)" - WORKS
+# Visual C++ 7.0, _MSC_VER 1300, msvcr70.dll
+#MSVC_VARIANT=MSVC2002
+# "Microsoft .Net Framework SDK Version 1.0" - WORKS
+# needs additional Platform SDK installation
+# Visual C++ 7.0, _MSC_VER 1300, msvcr70.dll
+#MSVC_VARIANT=DOTNET10
+
+# "Microsoft Visual Studio .NET 2003" - WORKS
+# Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll
+#MSVC_VARIANT=MSVC2003
+
+# "Microsoft .Net Framework SDK Version 1.1" - WORKS
+# needs additional Platform SDK installation
+# Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll
+#MSVC_VARIANT=DOTNET11
+
+# "Microsoft Visual Studio 2005" - WORKS
+# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
+#MSVC_VARIANT=MSVC2005
+
+# "Microsoft Visual C++ 2005 Express Edition" - WORKS
+# needs additional Platform SDK installation
+# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
+#MSVC_VARIANT=MSVC2005EE
+
+# "Microsoft .Net Framework 2.0 SDK" - WORKS
+# needs additional Platform SDK installation
+# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
+#MSVC_VARIANT=DOTNET20
+
+
+
+##### Libraries #####
+
+#
+# Mandatory: GLib settings
#
# Current versions of GTK+ 1.3 require GLib 2.0. Earlier versions of
# GTK+ 1.3 are buggy; we don't recommend using them, and we don't
-# support them. Upgrade to the current version.
+# support them. Upgrade to at least GLib 2.0.
#
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
-# directly in a "gtk+" directory, while GTK+ 2.x developer's packages
-# put header files in an "include\gtk-{version}" directory and libraries
-# in a "lib\gtk-{version}" directory.
+# Mandatory: GTK (& related) settings
#
# It's possible, to build both GTK version 1 and 2 at the same time,
-# or only one of the versions. GTK version 1 is currently recommended.
+# or only one of the versions. GTK version 2 is recommended.
#
# If you want building with GTK+ 1.3, set GTK1_DIR to the pathname of the
# "gtk+" directory; if you want building with GTK+ 2.x, set GTK2_DIR to
# 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=$(ETHEREAL_LIBS)\gnutls-win32-msvc\gnutls
-
-# Declare the version of your gtk2 and pango. (MAJOR + MINOR Version number
-# but without MICRO version number)
+# Mandatory for GTK >= 2: Version numbers of gtk2 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.
#
-#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
-# Support for GTK 2.8 is currently experimental ...
+# GTK 2.6 is the old mainline since Ethereal 0.10.14
+#GTK2_INST_VERSION=2.6
+#PANGO_INST_VERSION=1.8
+# Support for GTK 2.8
#GTK2_INST_VERSION=2.8
-#PANGO_INST_VERSION=1.10
+#PANGO_INST_VERSION=1.14
+# GTK 2.10 is the mainline since Wireshark 0.99.5
+GTK2_INST_VERSION=2.10
+PANGO_INST_VERSION=1.16
#
# If you have GTK-Wimp, set this to the pathname of the directory in
# 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=$(ETHEREAL_LIBS)\gtk-wimp
-GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
+GTK_WIMP_DIR=$(WIRESHARK_LIBS)\gtk-wimp\gtk-wimp-0.7.0-bin
#
-# If you have Zlib, set this to the pathname of the directory in
-# which the Zlib headers and .lib file are stored.
+# Optional: WinPcap developer's pack to capture network traffic.
#
-# If you don't have Zlib, comment this line out, so that Zlib isn't
-# defined.
+# If you have the WinPcap developer's pack (at least version 3.0),
+# set this to the directory in which the WinPcap developer's pack resides.
+#
+# If you don't have the WPdpack, comment this line out, so that
+# PCAP_DIR isn't defined.
#
-ZLIB_DIR=$(ETHEREAL_LIBS)\zlib123-dll
+PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
#
-# Set PCAP_DIR to the pathname of the directory in which the WinPcap
-# developer's pack resides
+# Optional: The ZLib enables unzipping of gzip compressed capture files
+# "on the fly".
+#
+# If you have Zlib, set this to directory in which the Zlib headers
+# and .lib file are stored.
#
-PCAP_DIR=$(ETHEREAL_LIBS)\WPdpack
+# If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
+# defined.
+#
+# ZLIB must be recompiled on none MSVC 6 compilers, otherwise C runtime
+# lib (msvcr)version conflicts appear.
+!IF "$(MSVC_VARIANT)" == "MSVC6"
+ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123-dll
+!ELSE
+ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
+!ENDIF
#
-# Set NET_SNMP_DIR to the pathname of the directory in which the
-# Net-SNMP include files and library resides.
+# Optional: The Net-SNMP library enables SNMP OID to name resolvings
+# for the MIBs available.
+#
+# If you have Net-SNMP, set this to the pathname of the directory in
+# which the Net-SNMP headers and .lib file are stored.
+#
+# If you don't have Net-SNMP, comment this line out, so that NET_SNMP_DIR
+# isn't defined.
#
-NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.2.2
+NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.4
#
-# If you have GNU ADNS, set this to the pathname of the directory in
-# which the GNU ADNS .lib file is stored.
+# Optional: the ADNS library enables asynchronous (nonblocking) DNS
+# name resolvings.
+#
+# If you have GNU ADNS, set this to the directory in which the GNU ADNS
+# .lib file is stored.
#
# 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-05
+ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05
#
-# If you have the PCRE (Perl Compatible Regular Expressions) library,
-# set this to the pathname of the directory in which the GNUWIN32
-# pcre-lib package has been extracted.
+# 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=$(ETHEREAL_LIBS)\pcre-6.4
+PCRE_DIR=$(WIRESHARK_LIBS)\pcre-6.4
#
-# If you have the Nettle encryption library, set this to the pathname
-# of the directory in which the nettle package has been extracted.
+# Optional: the GNUTLS library enables ssl decryption.
+#
+# If you have the GNUTLS library, set this to the directory where
+# the lib and include files are stored.
+#
+# If you don't have GNUTLS, comment this line out, so that GNUTLS_DIR
+# isn't defined.
+#
+# Platform SDK conflicts with openssl.h header
+GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1
+
+#
+# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
+#
+# If you have the kerberos for windows (mit) library, set this to the
+# directory where the kfw package is stored.
+#
+# If you don't have KFW, comment this line out, so that KFW_DIR
+# isn't defined.
+#
+KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5
+
+#
+# Optional: the Nettle library enables ??? decryption.
+#
+# If you have the Nettle encryption library, set this to the
+# directory in which the nettle package is stored.
#
# 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.
+# Optional: the LUA library enables scripting support.
+#
+# If you have the LUA library, set this to the directory in which
+# the LUA package is stored.
#
# If you don't have LUA, comment this line out, so that LUA_DIR
# isn't defined.
#
-LUA_DIR=$(ETHEREAL_LIBS)\lua5.1
+LUA_DIR=$(WIRESHARK_LIBS)\lua5.1
#
-# Set ICONV_DIR to the pathname of the directory in which the
+# Optional: the PORTAUDIO library enables audio output for RTP streams.
+#
+# If you have the PORTAUDIO library (used for rtp_player), set this to
+# the directory in which the PORTAUDIO library is stored.
+#
+# 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
+
+#
+# Version number of PortAudio
+#
+#PORTAUDIO_VERSION=18
+PORTAUDIO_VERSION=19
+
+#
+# Mandatory for GTK >= 2: Iconv
+#
+# Set ICONV_DIR to 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
+# Mandatory for GTK >= 2: Gettext
+#
+# Set GETTEXT_DIR to 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
+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_Devpack_1_0_0_594\AirPcap_Devpack
-# Compiler flags
-# /W3 warning level 3 (0 less - 4 most, 1 default)
-# /Zi create .pdb file for debugging
-LOCAL_CFLAGS=/Zi /W3
-# Linker flags
-# /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
+##### Tools #####
+
+# Set the following mandatory commands to find the tools.
+# The easiest way is to use the corresponding packages from cygwin.
# Set up the path to the cygwin binaries
CYGWIN_PATH=c:\cygwin\bin
-# Set up the path to some required DLLs
-DLL_PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin
+# command for a shell (cygwin's bash package recommended)
+SH_PROG=bash
+# bash versions after 3.1.6 need the 'igncr' shell option to be able to
+# process scripts in windows 'native format' (dos crlf format).
+# The following !IF results in the option being used only if it is available
+# since using it on bash version 3.1.6 (or earlier) is not required and
+# will cause an error message.
+!if "$(SH_PROG)"=="bash" && [$(CYGWIN_PATH)\bash -c "set -o igncr" 2>nul: ] == 0
+SH_FLAGS=-o igncr
+!endif
-# Set the following commands to find the tools.
-# The easiest way is to use the corresponding packages from cygwin.
+SH=$(SH_PROG) $(SH_FLAGS)
-# command for a shell (typically cygwin's bash package)
-SH=bash
-# command for perl (typically cygwin's perl package)
+# command for perl (cygwin's perl package recommended)
PERL=perl
-# command for pod2man and pod2html (part of the perl package)
+# command for pod2man and pod2html
+# (part of the perl package, usually leave these unchanged)
POD2MAN=$(SH) pod2man
POD2HTML=$(SH) pod2html
-# command for python (native windows version)
-#PYTHON="C:/python23/python.exe"
+# command for native windows python (recommended)
+# both V2.4 and V2.5 should work
+PYTHON="C:/python24/python.exe"
+#PYTHON="C:/python25/python.exe"
# add native python to the path (not needed if cygwin's python is used)
-#PATH=c:\python23;$(PATH)
+PATH=c:\python24;$(PATH)
+#PATH=c:\python25;$(PATH)
-# command for python (typically cygwin's python package)
-PYTHON=env python
+# command for python (cygwin's python package, not recommended)
+#PYTHON=env python
-# command for lex/flexx (typically cygwin's flex package)
+# command for lex/flexx (cygwin's flex recommended)
LEX=flex
-# command for yacc/bison (typically cygwin's bison package)
+# command for yacc/bison (cygwin's bison recommended)
YACC=bison
-# To build the installer
-MAKENSIS="C:/program files/nsis/makensis.exe"
-
-# 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.
#
-# 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.
+# Optional: To build the NSIS installer.
+#
+# If you have the NSIS package, set this to the NSIS executable.
#
-MAKENSIS_MODERN_UI=USE
+# If you don't have NSIS, comment this line out, so that MAKENSIS
+# isn't defined.
+#
+MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe"
-# To build the developers documentation with doxygen and dot.
-# Currently experimental only.
-# You will have to download and install:
#
-# Doxygen from: www.doxygen.org
+# Optional: To build the developers API documentation with doxygen and dot.
+# Currently experimental, outdated and incomplete.
+#
+# You will have to download and install:
+# Doxygen from: http://www.doxygen.org
# Graphviz from: http://www.research.att.com/sw/tools/graphviz/
#
+# If you have doxygen, set this to the doxygen executable.
+#
# If you don't want the developers documentation (or don't have the tools),
# comment this line out, so that DOXYGEN isn't defined.
#
-#DOXYGEN="C:/program files/doxygen/bin/doxygen.exe"
+#DOXYGEN="$(PROGRAM_FILES)/doxygen/bin/doxygen.exe"
-# 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:
+#
+# Recommended: Use the compressed html help format .chm as the Wireshark integrated help.
+#
+# The required htmlhelp.h and htmlhelp.lib should be included in MSVC_VARIANT > MSVC6.
+#
+# For MSVC_VARIANT == MSVC6 you will have to download and install the html help workshop from:
#
# http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html
# /hwMicrosoftHTMLHelpDownloads.asp
# 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_DIR="C:/Program Files/HTML Help Workshop/"
+HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
+
+
+##### Flags, PATHs and Miscellaneous #####
+
+# Compiler flags:
+# /W3 warning level 3 (0 less - 4 most, 1 default)
+# /Zi create .pdb file for debugging
+# /MD use "Multithreading Debug" libraries
+# /D_CRT_SECURE_NO_DEPRECATE don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT"
+# /D_CRT_NONSTDC_NO_DEPRECATE don't warn for "Deprecated CRT Functions" as MSDN calls this
+#
+!IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11"
+LOCAL_CFLAGS=/Zi /W3 /MD
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
+LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
+!ELSE
+!ERROR MSVC_VARIANT unknown
+!ENDIF
+
+# Linker flags:
+# /DEBUG generate debug info
+# /PROFILE generate map file(s) for profiling
+# /DEFAULTLIB:xxx use xxx as the standard C library
+# /NODEFAULTLIB:xxx don't use xxx as the standard C library
+#
+LOCAL_LDFLAGS=/DEBUG
-# According to http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=403
+PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+
+#
+# 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:
# It looks like we'll have to call "set copycmd=/y" before we run xcopy.
COPYCMD=/y
-# If you don't want to build libethereal.dll, you should comment out the
+#
+# 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_LIBETHEREAL=USE
+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
+
+
+
+##### C-Runtime Redistributable #####
+#
+# The C-Runtime since Version 7 must be shipped together with
+# the program installer, to avoid missing msvcr*.dll files on
+# the target machine.
+#
+# The location of these files differ on the various compiler
+# packages, the following will use the default paths depending
+# on the package version.
+#
+!IF "$(MSVC_VARIANT)" == "MSVC6"
+# msvcrt.dll will already be available on target machines - nothing additional to install
+
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2002"
+# you probably need to tweak this directory if you don't use the professional edition!
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio .NET\Visual Studio .NET Professional - English\msvcr70.dll
+
+!ELSEIF "$(MSVC_VARIANT)" == "DOTNET10"
+# no redistributable available for this package!
+
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2003"
+# you probably need to tweak this directory if you don't use the professional edition!
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio .NET 2003\Visual Studio .NET Professional 2003 - English\msvcr71.dll
+
+!ELSEIF "$(MSVC_VARIANT)" == "DOTNET11"
+# no redistributable available for this package!
+
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005"
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\*.*
+
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE"
+# 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_x86.exe
-!IFDEF ENABLE_LIBETHEREAL
-# Uncomment next line to link plugins with the import library of libethereal.dll
-LINK_PLUGINS_WITH_LIBETHEREAL=USE
+!ELSEIF "$(MSVC_VARIANT)" == "DOTNET20"
+# 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_x86.exe
+
+!ELSE
+!ERROR MSVC_VARIANT unknown
!ENDIF
+
+
+##### Advanced: Docbook/XML documentation generation #####
+# If you want to generate the Docbook/XML based docs (User's and Developer's
+# Guide, ...), you'll need some additional tools / libraries compared to the
+# rest of the build process.
+#
+# FOR DETAILED INSTRUCTIONS TO GENERATE THE DOCS, SEE: docbook\readme.txt.
+#
+# If you don't call the Makefile.nmake in the docbook dir to generate the
+# docs, the following settings in this section will have no effect.
+
+# formatting objects processor executable
+# Comment this out if you don't have fop installed or you don't want the docs
+# in PDF format.
+!IFNDEF FOP
+FOP=fop-0.20.5\fop.bat
+!ENDIF
+
+# Additional options to fop.
+FOP_OPTS=-Xmx256m
+
+# html help compiler
+# Comment this out if you don't have hhc.exe or you don't want the docs in
+# .chm format.
+#
+# Beware: hhc.exe is NOT part of the MSVC packages in HHC_DIR mentioned above,
+# so you'll need to install the HTML Help Workshop for this.
+HHC_EXE="$(HHC_DIR)\hhc.exe"
+
+# html to text converter for text version of release notes, e.g. elinks.
+# This could also be "lynx", or "true" if neither elinks nor lynx is installed
+# (cygwin: lynx works, elinks not available, links and true doesn't produce output)
+#HTML2TXT=elinks -dump -dump-width 72
+#HTML2TXT=links -dump -width 72
+HTML2TXT=lynx -dump -width=72 -nolist -stdin
+#HTML2TXT="true"
+
+# the XSL processor (part of cygwin's libxslt package)
+XSLTPROC="xsltproc"
+
+# the XML validator (part of cygwin's libxml2 package)
+XMLLINT="xmllint"
+
+
+
+##############################################################################
#
# 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
# was necessary.
#
+##############################################################################
+
+#
+# The RC_VERSION should be comma-separated, not dot-separated,
+# as per Graham Bloice's message in
+#
+# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html
+#
+# "The RC_VERSION variable in config.nmake should be comma separated.
+# This allows the resources to be built correctly and the version
+# number to be correctly displayed in the explorer properties dialog
+# for the executables, and XP's tooltip, rather than 0.0.0.0."
+#
+
+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).$(WTAP_VERSION_MICRO)
+RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)
+
+
GLIB_CFLAGS=/I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
/I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include
GCC_GLIB_CFLAGS=-I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
$(GTK2_DIR)\lib\pango-1.0.lib \
$(GLIB_LIBS)
+!IF "$(GTK2_INST_VERSION)" == "2.10"
+GTK2_LIB_DIR=2.10.0
+NEED_LIBPNG_DLL=USE
+NEED_CAIRO_DLL=USE
+GTK_WIMP_DIR=DUMMY_TO_USE_WIMP
+GTK_WIMP_DLLSRC_DIR=$(GTK2_DIR)\lib\gtk-2.0\2.10.0\engines
+GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.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.8"
# 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
+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.14"
+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
+!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 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"
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 won't have any benefit on Win32, but breaks compatibility with 3.0
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
+# no WpdPack installed
WINPCAP_CONFIG=
PCAP_FINDALLDEVS_CONFIG=
PCAP_DATALINK_NAME_TO_VAL_CONFIG=
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
+!else
+NET_SNMP_CFLAGS=
+NET_SNMP_LIBS=
+NET_SNMP_CONFIG=
+!ENDIF
+
!IFDEF ADNS_DIR
ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
ADNS_CONFIG=
!ENDIF
+!IFDEF KFW_DIR
+KFW_PATH=$(KFW_DIR)\bin
+KFW_CFLAGS=/I$(KFW_DIR)\inc
+KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib
+# Nmake uses carets to escape special characters
+KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1
+!else
+KFW_CFLAGS=
+KFW_LIBS=
+KFW_CONFIG=
+!ENDIF
+
!IFDEF PCRE_DIR
PCRE_PATH=$(PCRE_DIR)\bin
PCRE_CFLAGS=/I$(PCRE_DIR)\include
NETTLE_CONFIG=
!ENDIF
-!IFDEF ENABLE_LIBETHEREAL
-LIBETHEREAL_CONFIG=^#define HAVE_LIBETHEREALDLL 1
-!ELSE
-LIBETHEREAL_CONFIG=
-!ENDIF
-
!IFDEF GNUTLS_DIR
GNUTLS_PATH=$(GNUTLS_DIR)
-GNUTLS_CFLAGS=/I$(GNUTLS_DIR)
-GNUTLS_LIBS=$(GNUTLS_DIR)\gnutls.lib user32.lib
+# /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash
+GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT
+GNUTLS_LIBS=\
+ $(GNUTLS_DIR)\bin\libtasn1-3.lib \
+ $(GNUTLS_DIR)\bin\libgpg-error-0.lib \
+ $(GNUTLS_DIR)\bin\libgcrypt-11.lib \
+ $(GNUTLS_DIR)\bin\libgnutls-13.lib
# Nmake uses carets to escape special characters
GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1
+LIBGCRYPT_CONFIG=^#define HAVE_LIBGCRYPT 1
!else
GNUTLS_CFLAGS=
GNUTLS_LIBS=
GNUTLS_CONFIG=
+LIBGCRYPT_CONFIG=
!ENDIF
!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
LUA_CONFIG=
!ENDIF
+!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
+!IF "$(MSVC_VARIANT)" == "MSVC6"
+HHC_CFLAGS=/I"$(HHC_DIR)\include" -DHHC_DIR
+HHC_LIBS="$(HHC_DIR)\lib\htmlhelp.lib"
+!ELSE
+HHC_CFLAGS=-DHHC_DIR
+HHC_LIBS=htmlhelp.lib
+!ENDIF
+!ELSE
+HHC_CFLAGS=
+HHC_LIBS=
+!ENDIF
+
+!IFDEF ENABLE_LIBWIRESHARK
+LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1
+# Link plugins with the import library of libwireshark.dll
+LINK_PLUGINS_WITH_LIBWIRESHARK=USE
+!ELSE
+LIBWIRESHARK_CONFIG=
+!ENDIF
+
# Construct the path
-PATH=$(PATH);$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH)
+PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
+
+
+# "convert" the MSVC variant into the required MSC compiler version
+!IF "$(MSVC_VARIANT)" == "MSVC6"
+MSC_VER_REQUIRED=1200
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10"
+MSC_VER_REQUIRED=1300
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11"
+MSC_VER_REQUIRED=1310
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
+MSC_VER_REQUIRED=1400
+!ELSE
+!ERROR MSVC_VARIANT unknown
+!ENDIF
git.samba.org / obnox / wireshark / wip.git / blobdiff