# Some more informations about the settings in this file, can be found
# in the file README.win32 and the Developer's Guide (available online).
-
+##### Target platform #####
+# Only "win32" and "win64" are valid (for now).
+# This can be defined in the system environment.
+!IFNDEF WIRESHARK_TARGET_PLATFORM
+WIRESHARK_TARGET_PLATFORM=win32
+!ENDIF
##### Versions #####
# The current Wireshark version
# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
VERSION_MAJOR=1
-VERSION_MINOR=0
-VERSION_MICRO=99
+VERSION_MINOR=3
+VERSION_MICRO=1
VERSION_BUILD=0
# It's recommended to change VERSION_EXTRA for your own custom builds
# e.g. "-SVN-12345"
# 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
+WIRESHARK_LIBS=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
#
# Base directory, where your programs reside.
# This setting is used only inside this file.
#
-PROGRAM_FILES=C:/Program Files
+PROGRAM_FILES=$(PROGRAMFILES)
+
+#
+# Location of the "tools" directory. This affects HTML2TXT below and should
+# be overridden by makefiles in any subdirectories that use HTML2TXT.
+!IFNDEF TOOLS_DIR
+TOOLS_DIR=tools
+!ENDIF
+#
+# Machine type for the compiler and linker
+# TARGET_MACHINE (Used for link /MACHINE) should be one of "X86" or "X64"
+# (sorry ARM, Alpha, MIPS, and Itanium fans).
+# CPU (Used by win32.mak) should be one of "i386" or "AMD64".
+!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
+TARGET_MACHINE=x86
+CPU=i386
+VCREDIST_DLL=x86
+!else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
+TARGET_MACHINE=x64
+CPU=AMD64
+VCREDIST_DLL=amd64
+!else
+!error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us.
+!endif
##### Microsoft Visual C / Studio Variant #####
# "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)"
# Visual C++ 7.0, _MSC_VER 1300, msvcr70.dll
# 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"
-# needs additional Platform SDK installation?
# Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll
-# With this variant, Wireshark will compile but fails to run!
-#
-# THIS VARIANT CURRENTLY WON'T WORK - YOU HAVE BEEN WARNED!
#MSVC_VARIANT=MSVC2008EE
#
# If you don't have NASM, comment this line out, so that NASM
# isn't defined.
#
-#NASM=c:\progs\nasm\nasm.exe
-NASM=$(WIRESHARK_LIBS)\nasm-2.00\nasm.exe
-
+NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
-##### Libraries #####
+!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
+##### Win32 Libraries #####
#
# Mandatory: GLib settings
#
#
GLIB_VERSION=2.0
GLIB_DIR=$(WIRESHARK_LIBS)\glib
+# This macro is used by the setup target.
+GLIB_PKG=2.20.5-1
+
+##### To Use new packet list uncomment this line ####
+### Warning Experimental - work in progress
+NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
#
# Mandatory: GTK (& related libs) settings
#
# Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x
#
-# If you want building with GTK+, set GTK_DIR to the pathname of the
+# 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
+# These macros are used by the nsis installer script and by the install target.
+TIFF_DLL=libtiff-3.dll
+JPEG_DLL=libjpeg-7.dll
+FREETYPE_DLL=freetype6.dll
+FONTCONFIG_DLL=libfontconfig-1.dll
+EXPAT_DLL=libexpat-1.dll
+# These macros are used by the setup target.
+GTK_PKG=2.16.6-1
+CAIRO_PKG=1.8.8-2
+ATK_PKG=1.26.0-1
+LIBPNG_PKG=1.2.39-1
+TIFF_PKG=libtiff_3.9.1-1_win32
+JPEG_PKG=jpeg_7-1_win32
+PANGO_PKG=1.24.5-2
+FREETYPE_PKG=2.3.9-1
+FONTCONFIG_PKG=2.7.3-1
+EXPAT_PKG=2.0.1-1
#
# Mandatory: Version numbers of GTK and pango.
# These macros are used by the nsis installer script and by the setup target.
#
# GTK 2.12 is the mainline since Wireshark 0.99.7
-GTK_INST_VERSION=2.12
-PANGO_INST_VERSION=1.20
+GTK_INST_VERSION=2.16
+PANGO_INST_VERSION=1.24
#
-# 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 for GTK >= 2: Gettext
#
-# Please note: GTK 2.8 (and later?) includes GTK-Wimp
-# (in this case these GTK-Wimp related settings will have no effect)
+# Set GETTEXT_DIR to the directory in which the
+# GETTEXT include files and library resides.
#
-GTK_WIMP_DIR=$(WIRESHARK_LIBS)\gtk-wimp\gtk-wimp-0.7.0-bin
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1
+# This macro is used by the nsis installer script and by the install target.
+GETTEXT_DLL=intl.dll
+# This macro is used by the setup target.
+GETTEXT_PKG=-runtime-0.17-1
#
# Optional: WinPcap developer's pack to capture network traffic.
# PCAP_DIR isn't defined.
#
PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
+PCAP_VERSION=4_1_beta5
#
# Optional: WinPcap remote capture support and new API
# (pcap_open(), pcap_findalldevs_ex(), etc.)
#
-#PCAP_REMOTE=1
+PCAP_REMOTE=1
#
# Optional: The ZLib enables unzipping of gzip compressed capture files
# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
# isn't defined.
#
-ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05
+# If C_ARES_DIR is defined below, it will override this setting.
+#
+#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+
+#
+# Optional: the c-ares library enables asynchronous (nonblocking) DNS
+# name resolvings.
+#
+# 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'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.
+#
+C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-1.6.0ws
#
# Optional: the PCRE (Perl Compatible Regular Expressions) library
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1
+GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.8.1-1
#
# 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-2.5
+KFW_DIR=$(WIRESHARK_LIBS)\kfw-3.2.2-ws1
#
# Optional: the Nettle library enables ??? decryption.
# If you don't have LUA, comment this line out, so that LUA_DIR
# isn't defined.
#
-LUA_DIR=$(WIRESHARK_LIBS)\lua5.1
+LUA_DIST=5_1_4_Win32_dll6
+LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
#
# Optional: the PORTAUDIO library enables audio output for RTP streams.
# 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=19
#
-# 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.
+# 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
+
+#
+# Optional: LIBSMI, System Management Interface
+#
+# Used for oid-name resolution for SNMP and other protocols
+#
+SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
+
+#
+# Optional: GeoIP, IP address database lookups
+#
+# Used to map IP addresses to MaxMind GeoIP database entries
+#
+# GeoIP requires IPv6 definitions that don't ship with Visual C++ 6.0.
+# 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.5ws
+!ENDIF
+
+!else
+##### Win64 Libraries #####
+#
+# Mandatory: GLib settings
+#
+# Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x
+#
+GLIB_VERSION=2.0
+GLIB_DIR=$(WIRESHARK_LIBS)\glib
+# This macro is used by the setup target.
+GLIB_PKG=2.20.5-1
+
+##### To Use new packet list uncomment this line ####
+### Warning Experimental - work in progress
+#NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
+
+#
+# Mandatory: GTK (& related libs) settings
+#
+# Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x
+#
+# 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
+# These macros are used by the nsis installer script and by the install target.
+TIFF_DLL=libtiff-3.dll
+JPEG_DLL=libjpeg-7.dll
+FREETYPE_DLL=libfreetype-6.dll
+FONTCONFIG_DLL=libfontconfig-1.dll
+EXPAT_DLL=libexpat-1.dll
+# These macros are used by the setup target.
+GTK_PKG=2.16.6-1
+CAIRO_PKG=1.8.8-2
+ATK_PKG=1.26.0-2
+LIBPNG_PKG=1.2.40-1
+TIFF_PKG=libtiff_3.9.1-1_win64
+JPEG_PKG=jpeg_7-1_win64
+PANGO_PKG=1.24.5-2
+FREETYPE_PKG=2.3.9-2
+FONTCONFIG_PKG=2.7.3-1
+EXPAT_PKG=2.0.1-2
+
#
-##ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32
+# 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
+PANGO_INST_VERSION=1.24
#
# 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-0.14.5
-GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1
+GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.17-1
+# This macro is used by the nsis installer script and by the install target.
+GETTEXT_DLL=libintl-8.dll
+# This macro is used by the setup target.
+GETTEXT_PKG=_0.17-1_win64
+
+#
+# Optional: WinPcap developer's pack to capture network traffic.
+#
+# 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.
+#
+PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
+PCAP_VERSION=4_1_beta5
+
+#
+# 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
+# and .lib file are stored.
+#
+# If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
+# defined.
+#
+ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
+
+#
+# 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.
+#
+# If C_ARES_DIR is defined below, it will override this setting.
+#
+#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+
+#
+# Optional: the c-ares library enables asynchronous (nonblocking) DNS
+# name resolvings.
+#
+# 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'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.
+#
+#C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-1.5.2ws
+
+#
+# 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.
+#
+# 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-2.8.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-3.2.2-ws1
+
+#
+# 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=$(WIRESHARK_LIBS)\nettle-1.10
+
+#
+# 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_DIST=5_1_4_Win64_dll9
+LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
+
+#
+# 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_2
+
+#
+# Version number of PortAudio
+#
+#PORTAUDIO_VERSION=18
+PORTAUDIO_VERSION=19
+
#
# Optional: AirPcap developer's pack to capture wireless network traffic
# incl. 802.11 management frames.
# 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
+#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.5
+#SMI_DIR=$(WIRESHARK_LIBS)\libsmi-0.4.8
+
+#
+# Optional: GeoIP, IP address database lookups
+#
+# Used to map IP addresses to MaxMind GeoIP database entries
+#
+# GeoIP requires IPv6 definitions that don't ship with Visual C++ 6.0.
+# 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.5ws
+!ENDIF
+!endif
##### Tools #####
POD2MAN=$(SH) pod2man
POD2HTML=$(SH) pod2html
-# 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:\python24;$(PATH)
-#PATH=c:\python25;$(PATH)
+# Command for native Windows Python (recommended)
+# V2.4 to V2.6 should work
+
+# If you want to specify your Python settings, uncomment the lines below.
+#PYTHON="C:\Python26\python.exe"
+#PATH=c:\Python26;$(PATH)
-# command for python (cygwin's python package, not recommended)
+# Command for Cygwin's Python (not recommended)
#PYTHON=env python
+# Otherwise, find Python automatically.
+!IF !DEFINED(PYTHON)
+!IF EXIST(c:\Python26\python.exe)
+PYTHON="C:\Python26\python.exe"
+PATH=c:\Python26;$(PATH)
+!ELSE IF EXIST(c:\Python25\python.exe)
+PYTHON="C:\Python25\python.exe"
+PATH=c:\Python25;$(PATH)
+!ELSE IF EXIST(c:\Python24\python.exe)
+PYTHON="C:\Python24\python.exe"
+PATH=c:\Python24;$(PATH)
+!ENDIF
+!ENDIF
+
# command for lex/flexx (cygwin's flex recommended)
LEX=flex
# comment this line out, so that UPX isn't defined.
#
-UPX=$(WIRESHARK_LIBS)\upx301w\upx.exe
+UPX=$(WIRESHARK_LIBS)\upx303w\upx.exe
##### Flags, PATHs and Miscellaneous #####
MSC_VER_REQUIRED=1310
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
MSC_VER_REQUIRED=1400
-!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008EE"
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE"
MSC_VER_REQUIRED=1500
!ELSE
!ERROR MSVC_VARIANT unknown
# /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
+# /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
+# /D_BIND_TO_CURRENT_CRT_VERSION=1 Make sure our CRT and manifest versions match (http://msdn.microsoft.com/en-us/library/cc664727.aspx)
+# /DWIN32_LEAN_AND_MEAN Don't include unnecessary Windows include files (see windows.h)
+# /MANIFEST:no Don't create a SxS manifest. Makes sure our plugins don't load a second copy of the CRT.
#
!IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11"
-LOCAL_CFLAGS=/Zi /W3 /MD /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
-!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE"
-LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
+LOCAL_CFLAGS=/Zi /W3 /MD /DWIN32_LEAN_AND_MEAN /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 /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED)
+!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
+LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1
+!ENDIF
!ELSE
!ERROR MSVC_VARIANT unknown
!ENDIF
+# http://msdn.microsoft.com/en-us/library/bb385193.aspx
+# /MP Compiles multiple source files by using multiple processes
+# /MP[processMax] If you omit the processMax argument, the compiler retrieves the number of effective processors
+# on your computer from the operating system, and creates a process for each processor.
+#
+# The following compiler options and language features that are incompatible with the /MP option:
+#
+# * #import preprocessor directive
+# * /E, /EP
+# * /Gm
+# * /showIncludes
+# * /Yc
+#
+!IF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE"
+LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
+!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
+LOCAL_LDFLAGS=/DEBUG /MACHINE:$(TARGET_MACHINE)
+DLL_LDFLAGS =
+!IF $(MSC_VER_REQUIRED) >= 1400
+DLL_LDFLAGS = /MANIFEST:no
+!ENDIF
-PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) $(DLL_LDFLAGS)
#
# According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403
!IF "$(MSVC_VARIANT)" == "MSVC6"
# msvcrt.dll will already be available on target machines - nothing additional to install
+!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
+
!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
# 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
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(VCREDIST_DLL)\Microsoft.VC80.CRT\*.*
-!ELSEIF "$(MSVC_VARIANT)" == "DOTNET20"
+!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
+VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
-!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008EE"
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008"
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(VCREDIST_DLL)\Microsoft.VC90.CRT\*.*
!ELSE
!ERROR MSVC_VARIANT unknown
!ENDIF
-
+!IF DEFINED(VCREDIST_EXE) && ! EXIST("$(VCREDIST_EXE)")
+!ERROR Can't find $(VCREDIST_EXE). Have you downloaded it from Microsoft? \
+See the developer's guide section "C-Runtime "Redistributable" files" for details how to get it
+!ENDIF
##### Advanced: Docbook/XML documentation generation #####
# If you want to generate the Docbook/XML based docs (User's and Developer's
# (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"
+#HTML2TXT=lynx -dump -width=72 -nolist -stdin
+
+!IFNDEF HTML2TXT
+HTML2TXT=$(PYTHON) $(TOOLS_DIR)\html2text.py --width=72 --no-links
+!ENDIF
# the XSL processor (part of cygwin's libxslt package)
XSLTPROC="xsltproc"
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$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
/I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include
-GCC_GLIB_CFLAGS=-I$(GLIB_DIR)\include\glib-$(GLIB_VERSION) \
- -I$(GLIB_DIR)\lib\glib-$(GLIB_VERSION)\include
GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \
$(GLIB_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
$(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib
+GTHREAD_LIBS=$(GLIB_DIR)\lib\gthread-$(GLIB_VERSION).lib \
# GTK+
GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \
$(GTK_DIR)\lib\pango-1.0.lib \
$(GLIB_LIBS)
-!IF "$(GTK_INST_VERSION)" == "2.12"
+!IF "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" || "$(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=$(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 "$(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=$(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
!ERROR ? Unknown or invalid GTK_INST_VERSION
!ENDIF
-!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"
+!IF "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" || "$(PANGO_INST_VERSION)" == "1.18" || "$(PANGO_INST_VERSION)" == "1.16"
PANGO_LIB_DIR=1.5.0
!ELSE
!ERROR ? Unknown or invalid PANGO_INST_VERSION
!ENDIF
+!IF "$(PANGO_INST_VERSION)" == "1.24"
+#PANGO 1.24.5 Needs these:
+NEED_FREETYPE_DLL=USE
+NEED_FONTCONFIG_DLL=USE
+NEED_EXPAT_DLL=USE
+!ENDIF
!IFDEF AIRPCAP_DIR
AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1
AIRPDCAP_CONFIG=^#define HAVE_AIRPDCAP 1
PCAP_DATALINK_VAL_TO_NAME_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_NAME 1
# PCAP_BREAKLOOP won't have any benefit on Win32, but breaks compatibility with 3.0
PCAP_BREAKLOOP_CONFIG=
-WPCAP_CONSTIFIED_CONFIG=^#define WPCAP_CONSTIFIED 1
!ELSE
# no WpdPack installed
WINPCAP_CONFIG=
PCAP_DATALINK_NAME_TO_VAL_CONFIG=
PCAP_DATALINK_VAL_TO_NAME_CONFIG=
PCAP_BREAKLOOP_CONFIG=
-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
ZLIB_CONFIG=
!ENDIF
+!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
+C_ARES_CONFIG=^#define HAVE_C_ARES 1
+!else
+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_DLL=$(ADNS_DIR)\adns_win32\lib\adns_dll.dll
+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
-KFW_CFLAGS=/I$(KFW_DIR)\inc
+KFW_CFLAGS=/I$(KFW_DIR)\include
KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib
# Nmake uses carets to escape special characters
KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1
!IFDEF GNUTLS_DIR
GNUTLS_PATH=$(GNUTLS_DIR)
# /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash
-GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT
+GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL
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
+ $(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
!IFDEF LUA_DIR
LUA_CFLAGS=/I$(LUA_DIR)\include
-LUA_LIBS=$(LUA_DIR)\lib\dll\lua5.1.lib
+LUA_LIBS=$(LUA_DIR)\lua5.1.lib
# Nmake uses carets to escape special characters
LUA_CONFIG=^#define HAVE_LUA 1
LUA_VERSION=^#define HAVE_LUA_5_1 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=
SMI_CONFIG=
!ENDIF
+!IFDEF GEOIP_DIR
+GEOIP_CONFIG=^#define HAVE_GEOIP 1
+GEOIP_CFLAGS=/I$(GEOIP_DIR)\libGeoIP
+GEOIP_LIBS=$(GEOIP_DIR)\libGeoIP\GeoIP.lib
+!ELSE
+GeoIP_LIBS=
+GeoIP_CFLAGS=
+GeoIP_CONFIG=
+!ENDIF
+
!IFDEF ENABLE_LIBWIRESHARK
LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1
# Link plugins with the import library of libwireshark.dll
!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)
+
+# We can't use a lot of IPv6 code with plain Visual C++ 6.0
+!IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK)
+INET6_CONFIG=
+!ELSE
+INET6_CONFIG=^#define INET6 1
+!ENDIF
+
+!IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK)
+NTDDNDIS_CONFIG=
+!ELSE
+NTDDNDIS_CONFIG=^#define HAVE_NTDDNDIS_H 1
!ENDIF
git.samba.org / obnox / wireshark / wip.git / blobdiff