# $Id$
-# Some more informations about the settings in this file, can be found
+# Some more informations about the settings in this file, can be found
# in the file README.win32 and the Developer's Guide (available online).
# The current Wireshark version
# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
-VERSION_MAJOR=0
-VERSION_MINOR=99
-VERSION_MICRO=7
+VERSION_MAJOR=1
+VERSION_MINOR=0
+VERSION_MICRO=99
+VERSION_BUILD=0
# It's recommended to change VERSION_EXTRA for your own custom builds
# e.g. "-SVN-12345"
VERSION_EXTRA=
##### Directories #####
-#
-# Base directory, where your libraries reside, which are needed to
+#
+# Base directory, where your libraries reside, which are needed to
# compile the sources. This setting is used only inside this file.
#
WIRESHARK_LIBS=C:\wireshark-win32-libs
-#
-# Base directory, where your programs reside.
+#
+# Base directory, where your programs reside.
# This setting is used only inside this file.
#
PROGRAM_FILES=C:/Program Files
# 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
+# "Microsoft Visual Studio 6.0"
# Visual C++ 6.0, _MSC_VER 1200, msvcrt.dll (version 6)
-MSVC_VARIANT=MSVC6
+#MSVC_VARIANT=MSVC6
-# "Microsoft Visual Studio .NET (2002)" - WORKS
+# "Microsoft Visual Studio .NET (2002)"
# Visual C++ 7.0, _MSC_VER 1300, msvcr70.dll
#MSVC_VARIANT=MSVC2002
-# "Microsoft .Net Framework SDK Version 1.0" - WORKS
+# "Microsoft .Net Framework SDK Version 1.0"
# needs additional Platform SDK installation
# Visual C++ 7.0, _MSC_VER 1300, msvcr70.dll
#MSVC_VARIANT=DOTNET10
-# "Microsoft Visual Studio .NET 2003" - WORKS
+# "Microsoft Visual Studio .NET 2003"
# Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll
#MSVC_VARIANT=MSVC2003
-# "Microsoft .Net Framework SDK Version 1.1" - WORKS
+# "Microsoft .Net Framework SDK Version 1.1"
# needs additional Platform SDK installation
# Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll
#MSVC_VARIANT=DOTNET11
-# "Microsoft Visual Studio 2005" - WORKS
+# "Microsoft Visual Studio 2005"
# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
#MSVC_VARIANT=MSVC2005
-# "Microsoft Visual C++ 2005 Express Edition" - WORKS
+# "Microsoft Visual C++ 2005 Express Edition"
# needs additional Platform SDK installation
# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
#MSVC_VARIANT=MSVC2005EE
-# "Microsoft .Net Framework 2.0 SDK" - WORKS
+# "Microsoft .Net Framework 2.0 SDK"
# needs additional Platform SDK installation
# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
#MSVC_VARIANT=DOTNET20
+# "Microsoft Visual Studio 2008"
+# Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll
+MSVC_VARIANT=MSVC2008
+
+# "Microsoft Visual C++ 2008 Express Edition"
+# Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll
+#MSVC_VARIANT=MSVC2008EE
+
+#
+# Optional: To compile some time critical code from assembler instead of C
+#
+# If you have the NASM compiler, set this to the NASM executable.
+# http://nasm.sourceforge.net/
+#
+# If you don't have NASM, comment this line out, so that NASM
+# isn't defined.
+#
+NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
##### 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 at least GLib 2.0.
+# Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x
#
GLIB_VERSION=2.0
GLIB_DIR=$(WIRESHARK_LIBS)\glib
#
-# 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 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=$(WIRESHARK_LIBS)\gtk+
-GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
-
+# Mandatory: GTK (& related libs) settings
#
-# Mandatory for GTK >= 2: Version numbers of gtk2 and pango.
+# Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x
#
-# (MAJOR + MINOR Version number but without MICRO version number)
-# These macros are used by the nsis installer script and by the setup target.
+# If you want building with GTK+, set GTK_DIR to the pathname of the
+# directory in which the "include" and "lib" directories reside.
#
-# 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.14
-# GTK 2.10 is the mainline since Wireshark 0.99.5
-GTK2_INST_VERSION=2.10
-PANGO_INST_VERSION=1.16
+GTK_DIR=$(WIRESHARK_LIBS)\gtk2
#
-# If you have GTK-Wimp, set this to the pathname of the directory in
-# which the files are stored.
-#
-# If you don't have GTK-Wimp, comment this line out, so that GTK-Wimp isn't
-# defined.
+# Mandatory: Version numbers of GTK and pango.
#
-# Please note: GTK 2.8 (and later?) includes GTK-Wimp
-# (in this case these GTK-Wimp related settings will have no effect)
+# (MAJOR + MINOR Version number but without MICRO version number)
+# These macros are used by the nsis installer script and by the setup target.
#
-GTK_WIMP_DIR=$(WIRESHARK_LIBS)\gtk-wimp\gtk-wimp-0.7.0-bin
+# GTK 2.12 is the mainline since Wireshark 0.99.7
+GTK_INST_VERSION=2.12
+PANGO_INST_VERSION=1.20
#
# Optional: WinPcap developer's pack to capture network traffic.
#
-# If you have the WinPcap developer's pack (at least version 3.0),
+# 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
+# If you don't have the WPdpack, comment this line out, so that
# PCAP_DIR isn't defined.
#
PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
#
-# Optional: The ZLib enables unzipping of gzip compressed capture files
+# Optional: WinPcap remote capture support and new API
+# (pcap_open(), pcap_findalldevs_ex(), etc.)
+#
+PCAP_REMOTE=1
+
+#
+# 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
+# If you have Zlib, set this to directory in which the Zlib headers
# and .lib file are stored.
#
# 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
#
-# Optional: The Net-SNMP library enables SNMP OID to name resolvings
-# for the MIBs available.
+# Optional: the ADNS library enables asynchronous (nonblocking) DNS
+# name resolvings.
#
-# 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 have GNU ADNS, set this to the directory in which the GNU ADNS
+# .lib file is stored.
#
-# If you don't have Net-SNMP, comment this line out, so that NET_SNMP_DIR
+# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
# isn't defined.
#
-NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.4
+# If C_ARES_DIR is defined below, it will override this setting.
+#
+#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
#
-# Optional: the ADNS library enables asynchronous (nonblocking) DNS
+# Optional: the c-ares 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 have c-ares, set this to the directory in which the c-ares
+# .lib file is stored. Setting this will override ADNS_DIR above. You
+# can't have both.
#
-# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
+# If you're using Visual C++ 6.0, you'll have to use a platform SDK that
+# defines socklen_t, such as Windows Server 2003 PSDK.
+#
+# If you don't have c-ares, comment this line out, so that C_ARES_DIR
# isn't defined.
#
-ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05
+C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-1.5.2ws
#
-# Optional: the PCRE (Perl Compatible Regular Expressions) library
+# 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
+# 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-6.4
+PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
#
# Optional: the GNUTLS library enables ssl decryption.
#
-# If you have the GNUTLS library, set this to the directory where
+# 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
+#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1
+GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.3.8-1
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
#
-# If you have the kerberos for windows (mit) library, set this to the
+# 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
#
# Optional: the Nettle library enables ??? decryption.
#
-# If you have the Nettle encryption library, set this to the
+# 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
#
# NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10
-#
-# Optional: libsmi library enables OID and MIB resolution.
-#
-# If you have the libsmi library, set this to the directory in which
-# the libsmi package is stored.
-#
-# If you don't have libsmi, comment this line out, so that LIBSMI_DIR
-# isn't defined.
-#
-LIBSMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.5
-
#
# Optional: the LUA library enables scripting support.
#
-# If you have the LUA library, set this to the directory in which
+# 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
#
# Optional: the PORTAUDIO library enables audio output for RTP streams.
#
-# If you have the PORTAUDIO library (used for rtp_player), set this to
+# 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
+# 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
+PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
#
# Version number of PortAudio
-#
+#
#PORTAUDIO_VERSION=18
PORTAUDIO_VERSION=19
#
-# Mandatory for GTK >= 2: Iconv
-#
+# Iconv: Mandatory for Glib >= 2 and <= 2.14.4
+# [win-iconv statically linked as part of Glib >= 2.14.5]
# Set ICONV_DIR to the directory in which the
# ICONV include files and library resides.
#
-ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32
+##ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32
#
# Mandatory for GTK >= 2: Gettext
# 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-0.14.5
-
+#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1
#
-# Optional: AirPcap developer's pack to capture wireless network traffic
+# 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
+# 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,
+# 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
+#
+# Optional: LIBSMI, System Management Interface
+#
+# Used for oid-name resolution for SNMP and other protocols
+#
+SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
##### Tools #####
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).
+# 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.
# command for perl (cygwin's perl package recommended)
PERL=perl
-# command for pod2man and pod2html
+# command for pod2man and pod2html
# (part of the perl package, usually leave these unchanged)
POD2MAN=$(SH) pod2man
POD2HTML=$(SH) pod2html
# 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
+# /hwMicrosoftHTMLHelpDownloads.asp
#
# Then point HHC_DIR to the html help dir (where hhc.exe resides).
#
#
HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
+#
+# Optional: To reduce the size of dlls and exes, which is especially useful for USB device distributions (U3, PortableApps)
+#
+# If you have the UPX package, set this to the upx.exe executable.
+#
+# UPX can be downloaded from:
+# http://upx.sourceforge.net/
+#
+# If you don't have UPX, or don't want to pack exes and dlls,
+# comment this line out, so that UPX isn't defined.
+#
+
+UPX=$(WIRESHARK_LIBS)\upx301w\upx.exe
##### Flags, PATHs and Miscellaneous #####
+# "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
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE"
+MSC_VER_REQUIRED=1500
+!ELSE
+!ERROR MSVC_VARIANT unknown
+!ENDIF
+
# Compiler flags:
# /W3 warning level 3 (0 less - 4 most, 1 default)
# /Zi create .pdb file for debugging
# /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
+LOCAL_CFLAGS=/Zi /W3 /MD /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE"
+LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
!ELSE
!ERROR MSVC_VARIANT unknown
!ENDIF
# /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
+#
+LOCAL_LDFLAGS=/DEBUG
PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
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
+# install (debug) directory for Wireshark (relative to your source dir)
+INSTALL_DIR=wireshark-gtk2
##### C-Runtime Redistributable #####
#
-# The C-Runtime since Version 7 must be shipped together with
+# 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
+# The location of these files differ on the various compiler
# packages, the following will use the default paths depending
# on the package version.
#
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005"
MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\*.*
-!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE"
+!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_x86.exe
-!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
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008"
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*
!ELSE
!ERROR MSVC_VARIANT unknown
##### 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.
+# 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
+# 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
+# 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
FOP_OPTS=-Xmx256m
# html help compiler
-# Comment this out if you don't have hhc.exe or you don't want the docs in
+# 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,
##############################################################################
#
-# The RC_VERSION should be comma-separated, not dot-separated,
+# 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.
+# "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)
+RC_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_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
$(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib
-# GTK+ 1.3
-GTK1_CFLAGS=$(GLIB_CFLAGS) /I$(GTK1_DIR)\include /I$(GTK1_DIR)\include\gdk \
- /I$(GTK1_DIR)\lib\gtk+\include
-GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \
- $(GTK1_DIR)\lib\gdk.lib \
+# GTK+
+GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \
+ /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
+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\pango-1.0.lib \
$(GLIB_LIBS)
-# GTK+ 2.x
-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\gdk_pixbuf-2.0.lib \
- $(GTK2_DIR)\lib\pango-1.0.lib \
- $(GLIB_LIBS)
-
-!IF "$(GTK2_INST_VERSION)" == "2.10"
-GTK2_LIB_DIR=2.10.0
+!IF "$(GTK_INST_VERSION)" == "2.12"
+GTK_LIB_DIR=2.10.0
NEED_LIBPNG_DLL=USE
+NEED_LIBJPEG_DLL=USE
+NEED_LIBTIFF_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_DLLSRC_DIR=$(GTK_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_RCSRC_DIR=$(GTK_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
-GTK2_LIB_DIR=2.4.0
+!ELSEIF "$(GTK_INST_VERSION)" == "2.10"
+GTK_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.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_DLLSRC_DIR=$(GTK_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=$(GTK_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
-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
+!ELSE
+!ERROR ? Unknown or invalid GTK_INST_VERSION
!ENDIF
-# the lib dir of PANGO changed in 1.12
-!IF "$(PANGO_INST_VERSION)" == "1.14"
+!IF "$(PANGO_INST_VERSION)" == "1.20"
+PANGO_LIB_DIR=1.5.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.18"
+PANGO_LIB_DIR=1.5.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.16"
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
-!ELSEIF "$(PANGO_INST_VERSION)" == "1.4"
-PANGO_LIB_DIR=1.4.0
-!ELSEIF "$(PANGO_INST_VERSION)" == "1.2"
-PANGO_LIB_DIR=1.2.0
+!ELSE
+!ERROR ? Unknown or invalid PANGO_INST_VERSION
!ENDIF
!IFDEF AIRPCAP_DIR
WPCAP_CONSTIFIED=
!ENDIF
+PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1
+PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1
+
+!IF DEFINED(PCAP_DIR) && DEFINED(PCAP_REMOTE)
+PCAP_HAVE_REMOTE_CONFIG=^#define HAVE_REMOTE 1
+PCAP_REMOTE_CONFIG=^#define HAVE_PCAP_REMOTE 1
+PCAP_OPEN_CONFIG=^#define HAVE_PCAP_OPEN 1
+PCAP_FINDALLDEVS_EX_CONFIG=^#define HAVE_PCAP_FINDALLDEVS_EX 1
+PCAP_CREATESRCSTR_CONFIG=^#define HAVE_PCAP_CREATESRCSTR 1
+PCAP_SETSAMPLING_CONFIG=^#define HAVE_PCAP_SETSAMPLING 1
+!ELSE
+PCAP_HAVE_REMOTE_CONFIG=
+PCAP_REMOTE_CONFIG=
+PCAP_OPEN_CONFIG=
+PCAP_FINDALLDEVS_EX_CONFIG=
+PCAP_CREATESRCSTR_CONFIG=
+PCAP_SETSAMPLING_CONFIG=
+!ENDIF
+
!IFDEF ZLIB_DIR
ZLIB_PATH=$(ZLIB_DIR)
ZLIB_CFLAGS=/I$(ZLIB_DIR)\include
ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib
+ZLIB_DLL=$(ZLIB_DIR)\zlib1.dll
# Nmake uses carets to escape special characters
ZLIB_CONFIG=^#define HAVE_LIBZ 1
!else
ZLIB_CFLAGS=
ZLIB_LIBS=
+ZLIB_DLL=
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
+!IFDEF C_ARES_DIR
+!UNDEF ADNS_DIR
+C_ARES_CFLAGS=/I$(C_ARES_DIR)
+C_ARES_LIBS=$(C_ARES_DIR)\cares.lib
+C_ARES_DLL=$(C_ARES_DIR)\cares.dll
# Nmake uses carets to escape special characters
-NET_SNMP_CONFIG=^#define HAVE_NET_SNMP 1
+C_ARES_CONFIG=^#define HAVE_C_ARES 1
!else
-NET_SNMP_CFLAGS=
-NET_SNMP_LIBS=
-NET_SNMP_CONFIG=
-!ENDIF
-
+C_ARES_CFLAGS=
+C_ARES_LIBS=
+C_ARES_CONFIG=
!IFDEF ADNS_DIR
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
+ADNS_LIBS=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.lib
+ADNS_DLL=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.dll
# Nmake uses carets to escape special characters
ADNS_CONFIG=^#define HAVE_GNU_ADNS 1
!else
ADNS_CFLAGS=
ADNS_LIBS=
ADNS_CONFIG=
-!ENDIF
+!ENDIF # ADNS
+!ENDIF # C_ARES
!IFDEF KFW_DIR
KFW_PATH=$(KFW_DIR)\bin
$(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
+ $(GNUTLS_DIR)\bin\libgnutls-26.lib
# Nmake uses carets to escape special characters
GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1
LIBGCRYPT_CONFIG=^#define HAVE_LIBGCRYPT 1
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
+PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\include /I$(PORTAUDIO_DIR)\src\common /I$(PORTAUDIO_DIR)\src\os\win /DPA_NO_DS /DPA_NO_ASIO
!ENDIF
!ELSE
PORTAUDIO_CFLAGS=
HHC_LIBS=
!ENDIF
+!IFDEF SMI_DIR
+SMI_CONFIG=^#define HAVE_LIBSMI 1
+SMI_CFLAGS=/I$(SMI_DIR)\include
+SMI_LIBS=$(SMI_DIR)\lib\smi.lib
+!ELSE
+SMI_LIBS=
+SMI_CFLAGS=
+SMI_CONFIG=
+!ENDIF
+
!IFDEF ENABLE_LIBWIRESHARK
LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1
-# Link plugins with the import library of libwireshark.dll
+# Link plugins with the import library of libwireshark.dll
LINK_PLUGINS_WITH_LIBWIRESHARK=USE
!ELSE
LIBWIRESHARK_CONFIG=
!ENDIF
# Construct the path
+!IFDEF ICONV_DIR
PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
+!ELSE
+PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH)
+!ENDIF
-
-# "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
+# We can't use a lot of IPv6 code with plain Visual C++ 6.0
+!IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK)
+INET6_CONFIG=
!ELSE
-!ERROR MSVC_VARIANT unknown
+INET6_CONFIG=^#define INET6 1
!ENDIF
git.samba.org / obnox / wireshark / wip.git / blobdiff