-# $Id$
-
# Some more information about the settings in this file can be found in
# the file README.windows and the Developer's Guide (available online).
!ENDIF
##### Target platform #####
+
+# Pick up the value from the environment, VS2012 onwards sets PLATFORM via
+# vcvarsall.bat (it appears for X64 only).
+# For VS2010 and earlier you'll have to set the value yourself
+!IF "$(PLATFORM)" == "X64"
+WIRESHARK_TARGET_PLATFORM=win64
+!ENDIF
+
# Only "win32" and "win64" are valid (for now).
# This can be defined in the system environment.
!IFNDEF WIRESHARK_TARGET_PLATFORM
##### Versions #####
-# The SVN revision of our build. Updated by make-version.pl
-SVN_REVISION=0
+# The Git description of our build. Updated by make-version.pl
+GIT_REVISION=0
# The current Wireshark version. Recommended: Leave unchanged.
# Updated by make-version.pl
VERSION_MAJOR=1
-VERSION_MINOR=9
-VERSION_MICRO=1
-VERSION_BUILD=$(SVN_REVISION)
+VERSION_MINOR=99
+VERSION_MICRO=0
+VERSION_BUILD=$(GIT_REVISION)
# Local build information. Recommended: Unique string for your
# environment, e.g. "-JackStackBarbecue". Updated by make-version.pl
+# Defaults to the environment variable WIRESHARK_VERSION_EXTRA
-VERSION_EXTRA=
+VERSION_EXTRA=$(WIRESHARK_VERSION_EXTRA)
# The version of the wiretap library. Recommended: Leave unchanged.
WTAP_VERSION_MAJOR=$(VERSION_MAJOR)
WTAP_VERSION_MINOR=$(VERSION_MINOR)
WTAP_VERSION_MICRO=0
+# The version of the filetap library. Recommended: Leave unchanged.
+FTAP_VERSION_MAJOR=$(VERSION_MAJOR)
+FTAP_VERSION_MINOR=$(VERSION_MINOR)
+FTAP_VERSION_MICRO=0
+
##### Directories #####
#
# This can be defined in the system environment.
#
!IFNDEF WIRESHARK_LIB_DIR
+!IFDEF WIRESHARK_BASE_DIR
+WIRESHARK_LIB_DIR=$(WIRESHARK_BASE_DIR)\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs
+!ELSE
WIRESHARK_LIB_DIR=C:\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs
!ENDIF
+!ENDIF
#
# Base directory, where your programs reside.
# This setting is used only inside this file.
#
PROGRAM_FILES=$(PROGRAMFILES)
+PROGRAM_FILES_W6432=$(PROGRAMW6432)
#
# Location of the "tools" directory. This affects HTML2TXT below and should
##### 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
-
-# "Microsoft Visual Studio 2005"
-# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
-#MSVC_VARIANT=MSVC2005
-# "Microsoft Visual C++ 2005 Express Edition"
-# needs additional Platform SDK installation
-# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
-#MSVC_VARIANT=MSVC2005EE
+# Pick up the value from the environment, VS2012 onwards sets this via vcvarsall.bat
+# For VS2010 and earlier you'll have to set the value yourself
+# Assume that the lack of detection of Express editions doesn't matter
+!IF "$(VISUALSTUDIOVERSION)" == "10.0"
+MSVC_VARIANT=MSVC2010
+!ELSE IF "$(VISUALSTUDIOVERSION)" == "11.0"
+MSVC_VARIANT=MSVC2012
+!ELSE IF "$(VISUALSTUDIOVERSION)" == "12.0"
+MSVC_VARIANT=MSVC2013
+!ENDIF
-# "Microsoft .Net Framework 2.0 SDK"
-# needs additional Platform SDK installation
-# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
-#MSVC_VARIANT=DOTNET20
+# For the different Studios, see: http://en.wikipedia.org/wiki/Microsoft_Visual_Studio
+# Only one of the following MSVC_VARIANT settings should be used
# "Microsoft Visual Studio 2008"
# Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll
# "Microsoft Visual C++ 2012 Express Edition"
# Visual C++ 11.0, _MSC_VER 1700, msvcr110.dll
## Notes:
-## 1. Sep 20,2012: *Beta*: Build with VC11 (2012) succeeds; Seems OK: Minimally tested;
-## win32.mak is apparently not part of the MS 2012EE install;
-## To build Windows Wireshark, win32.mak must be obtained*
+## 1. win32.mak is apparently not part of the MS 2012EE install;
+## To build Windows Wireshark, win32.mak must be obtained [*]
## and copied to a dir specified in the Windows Environment
## variable 'include' (or to a dir added to the list in 'include').
-## *One possibility: download the Windows 7 Platform SDK and copy
+## Note that the 'include' environment variable is initialized
+## when vcvarsall.bat is called to set up the build environment.
+## [*]One possibility: download the Windows 7 Platform SDK and copy
## win32.mak from ...\Microsoft SDKs\Windows\v7.[something]\include
## See: http://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012
## 2. Dec 28,2012: "VS2012 Update 1" is required to use VS 2012 to build an .exe which
## will run on Windows XP (as well as on later versions of Windows).
## ToDo: It appears that some special setup is required to to do this.
## https://blogs.msdn.com/b/vcblog/archive/2012/10/08/10357555.aspx
-## 3. Feb 07,2013: [WMeier] I've noted no problems to date with Wireshark built with VS2012
-## based upon a fair amount of use while doing Wireshark testing and debugging.
##
#MSVC_VARIANT=MSVC2012EE
# Visual C++ 11.0, _MSC_VER 1700, msvcr110.dll
#MSVC_VARIANT=MSVC2012
+# "Microsoft Visual Studio 2013"
+# Visual C++ 12.0, _MSC_VER 1800, msvcr120.dll
+#MSVC_VARIANT=MSVC2013
+
+# "Microsoft Visual Studio 2013 Express Edition"
+# Visual C++ 12.0, _MSC_VER 1800, msvcr120.dll
+## Notes:
+## 1. win32.mak is apparently not part of the MS 2013EE install;
+## To build Windows Wireshark, win32.mak must be obtained [*]
+## and copied to a dir specified in the Windows Environment
+## variable 'include' (or to a dir added to the list in 'include').
+## Note that the 'include' environment variable is initialized
+## when vcvarsall.bat is called to set up the build environment.
+## [*]One possibility: download the Windows 7 Platform SDK and copy
+## win32.mak from ...\Microsoft SDKs\Windows\v7.[something]\include
+## See: http://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012
+#MSVC_VARIANT=MSVC2013EE
+
# The default if we haven't set a system environment variable or
# uncommented an entry above. We default to the version recommended
# in the Developer's Guide, namely MSVC++ 2010 Express Edition.
#
NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe
-#
-# Optional: the Python library enables scripting support.
-#
-# If you don't have the Python library, comment this line out, so that
-# PYTHON_EMBED isn't defined.
-#
-# NOTE: The Python library must have been compiled with the same
-# compiler (MSVC_VARIANT) as Wireshark. Known python.org Python
-# CRT versions:
-#
-# Python version CRT (32-bit) CRT (64-bit)
-# 2.4.4 7.1 ?
-# 2.6.1 9.0 ?
-# 2.6.2 ? 9.0
-# 2.7.1 9.0 9.0
-# 3.2.2 9.0 9.0
-#
-# If you versions of Python and Visual C++ use different CRTs
-# comment this out.
-#
-# XXX The DLL path in epan/wspython/wspy_libws.py likely needs to
-# be fixed before this is enabled by default.
-#PYTHON_EMBED=1
-
#
# Optional: the Python interpreter is used as part of the buildsystem
#
PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1
##### To Use packet editor uncomment this line ####
-### Warning Experimental - work in progress
-#WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1
+### Experimental - work in progress
+WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
##### Win32 Libraries #####
# These macros are used by the nsis installer script and by the install target.
#EXPAT_DLL=libexpat-1.dll
-FFI_DLL=libffi-5.dll
+FFI_DLL=libffi-6.dll
FONTCONFIG_DLL=libfontconfig-1.dll
FREETYPE_DLL=libfreetype-6.dll
INTL_DLL=libintl-8.dll
+HARFBUZZ_DLL=libharfbuzz-0.dll
JASPER_DLL=libjasper-1.dll
JPEG_DLL=libjpeg-8.dll
LZMA_DLL=liblzma-5.dll
PIXMAN_DLL=libpixman-1-0.dll
PNG_DLL=libpng15-15.dll
+SJLJ_DLL=libgcc_s_sjlj-1.dll
TIFF_DLL=libtiff-5.dll
XML_DLL=libxml2-2.dll
GDK_DLL=libgdk-win32-2.0-0.dll
GTK_DLL=libgtk-win32-2.0-0.dll
#GTK_PKG=2.24.10-2.7
-GTK_PKG=2.24.14-1.1
+GTK_PKG=2.24.23-1.1
PKG_SUFIX=ws
!ELSE
GDK_DLL=libgdk-3-0.dll
GTK_DLL=libgtk-3-0.dll
PKG_SUFIX=ws
GTK_PKG=3.4.4-2.1
+#GTK_PKG=3.6.1-1.1
!ENDIF
#
GTK_INST_VERSION=2.24
!ELSE
GTK_INST_VERSION=3.4
+#GTK_INST_VERSION=3.6
!ENDIF
#
-# Optional: WinPcap developer's pack to capture network traffic.
+# Recommended: Qt
+#
+# This must point to a top-level Qt directory. QMake should be in
+# $(QT5_BASE_DIR)\bin
+#
+# Qt's various paths are hardcoded but with care you can relocate your
+# installation directory:
+# http://stackoverflow.com/questions/913642/qmake-and-qt-install-prefix-how-can-i-select-a-new-location-for-qt-library
+#
+#QT5_BASE_DIR=output of "qmake -query QT_INSTALL_PREFIX"
+!IF !DEFINED(QT5_BASE_DIR)
+# Wireshark custom
+!IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws)
+QT5_BASE_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws
+# Digia official
+!ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010)
+QT5_BASE_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010
+# Qt 5.2.1 web installer default paths
+!ELSE IF EXIST(C:\Qt\5.2.1\msvc2010)
+QT5_BASE_DIR=C:\Qt\5.2.1\msvc2010
+!ELSE IF EXIST(C:\Qt\5.2.1\msvc2012)
+QT5_BASE_DIR=C:\Qt\5.2.1\msvc2012
+!ELSE IF EXIST(C:\Qt\5.2.1\msvc2012_64)
+QT5_BASE_DIR=C:\Qt\5.2.1\msvc2012_64
+# Digia official, installed in $(WIRESHARK_LIB_DIR)
+!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010)
+QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010
+!ENDIF
+!ENDIF
+
+#
+# Recommended: 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.
#
PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
-PCAP_VERSION=4_1_3
+WINPCAP_VERSION=4_1_3
WPD_VERSION=4_1_2
#
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.12.18-1.2
+GNUTLS_PKG=3.1.22-2.3
+GPGERROR_DLL=libgpg-error-0.dll
+GCC_DLL=libgcc_s_sjlj-1.dll
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
#
KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6
-#
-# 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_LIB_DIR)\nettle-1.10
-
-#
# Optional: the LUA library enables scripting support.
#
# If you have the LUA library, set this to the directory in which
# If you don't have LUA, comment this line out, so that LUA_DIR
# isn't defined.
#
-LUA_DIST=5_1_4_Win32_dll6
-LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4
+!IF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE"
+LUA_DIST=-5.2.3_Win32_dll11
+!ELSE
+LUA_DIST=-5.2.3_Win32_dll10
+!ENDIF
+LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3
#
# Optional: the PORTAUDIO library enables audio output for RTP streams.
#
# Used to map IP addresses to MaxMind GeoIP database entries
#
-GEOIP_PKG=1.4.8-2
+GEOIP_PKG=1.5.1-2
#
# Optional: WinSparkle, software updates
# These macros are used by the nsis installer script and by the install target.
#EXPAT_DLL=libexpat-1.dll
-FFI_DLL=libffi-5.dll
+FFI_DLL=libffi-6.dll
FONTCONFIG_DLL=libfontconfig-1.dll
FREETYPE_DLL=libfreetype-6.dll
INTL_DLL=libintl-8.dll
+HARFBUZZ_DLL=libharfbuzz-0.dll
JASPER_DLL=libjasper-1.dll
JPEG_DLL=libjpeg-8.dll
LZMA_DLL=liblzma-5.dll
PIXMAN_DLL=libpixman-1-0.dll
PNG_DLL=libpng15-15.dll
+SEH_DLL=libgcc_s_seh-1.dll
TIFF_DLL=libtiff-5.dll
XML_DLL=libxml2-2.dll
GDK_DLL=libgdk-win32-2.0-0.dll
GTK_DLL=libgtk-win32-2.0-0.dll
#GTK_PKG=2.24.10-2.7
-GTK_PKG=2.24.14-1.1
+GTK_PKG=2.24.23-1.1
PKG_SUFIX=ws
!ELSE
GDK_DLL=libgdk-3-0.dll
GTK_DLL=libgtk-3-0.dll
PKG_SUFIX=ws
GTK_PKG=3.4.4-2.1
+#GTK_PKG=3.6.1-1.1
!ENDIF
#
#GTK_INST_VERSION=2.16
GTK_INST_VERSION=2.24
!ELSE
-GTK_INST_VERSION=3.4
+#GTK_INST_VERSION=3.4
+GTK_INST_VERSION=3.6
+!ENDIF
+
+#
+# Recommended: Qt
+#
+# This must point to a top-level Qt directory. QMake should be in
+# $(QT5_BASE_DIR)\bin
+#
+# Qt's various paths are hardcoded but with care you can relocate your
+# installation directory:
+# http://stackoverflow.com/questions/913642/qmake-and-qt-install-prefix-how-can-i-select-a-new-location-for-qt-library
+#
+#QT5_BASE_DIR=output of "qmake -query QT_INSTALL_PREFIX"
+!IF !DEFINED(QT5_BASE_DIR)
+# Wireshark custom
+!IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws)
+QT5_BASE_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws
+# Digia official
+!ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010)
+QT5_BASE_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010
+# Digia official, installed in $(WIRESHARK_LIB_DIR)
+!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010)
+QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010
+!ENDIF
!ENDIF
#
-# Optional: WinPcap developer's pack to capture network traffic.
+# Recommended: 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.
#
PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
# This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
-PCAP_VERSION=4_1_3
+WINPCAP_VERSION=4_1_3
WPD_VERSION=4_1_2
#
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.12.18-1.2-1
+GNUTLS_PKG=3.1.22-2.3
+GPGERROR_DLL=libgpg-error6-0.dll
+GCC_DLL=libgcc_s_seh-1.dll
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
#
#KFW_DIR=$(WIRESHARK_LIB_DIR)\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_LIB_DIR)\nettle-1.10
-
#
# Optional: the LUA library enables scripting support.
#
# If you don't have LUA, comment this line out, so that LUA_DIR
# isn't defined.
#
-LUA_DIST=-5.1.4_Win64_dll10
-LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4
+!IF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE"
+LUA_DIST=-5.2.3_Win64_dll11
+!ELSE
+LUA_DIST=-5.2.3_Win64_dll10
+!ENDIF
+LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3
#
# Optional: the PORTAUDIO library enables audio output for RTP streams.
#
# Used to map IP addresses to MaxMind GeoIP database entries
#
-GEOIP_PKG=1.4.8-2
+GEOIP_PKG=1.5.1-2
#
# Optional: WinSparkle, software updates
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.
POD2MAN=$(SH) pod2man
POD2HTML=$(SH) pod2html
-# command for lex/flexx (cygwin's flex recommended)
+# command for sed (cygwin's sed recommended)
+SED=sed
+
+# Command for lex/flexx. Cygwin's flex or Chocolatey's win_flex
+# recommended.
+# Absolute or relative paths must be Windows-style
+
+# Chocolatey's C:\Chocolatey\bin\win_flex and -\win_bison are
+# currently unusable without some manual adjustments to the
+# win_flex and win_bison wrapper scripts. Calling the executables
+# directly should work.
+
+#LEX=win_flex
+#LEX=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_flex
LEX=flex
-# command for yacc/bison (cygwin's bison recommended)
+# Command for yacc/bison. Cygwin's bison or Chocolatey's win_bison
+# recommended.
+# Absolute or relative paths must be Windows-style
+
+#YACC=win_bison
+#YACC=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_bison
YACC=bison
# Commands to convert UNIX line endings to DOS/Windows
TEXTIFY=$(SH) $(TOOLS_DIR)/textify.sh
#
-# Optional: To build the NSIS installer.
+# Optional: Build the NSIS installer.
#
-# If you have the NSIS package, set this to the NSIS executable.
+# If NSIS is installed in a standard location (under Program Files
+# or Program Files (x86)) you shouldn't have to change anything.
#
-# If you don't have NSIS, comment this line out, so that MAKENSIS
-# isn't defined.
+# If NSIS is installed in a custom location uncomment the following
+# line and adjust the path accordingly.
#
+
+#MAKENSIS="\custom\path\to\NSIS\makensis.exe"
+
+# Find NSIS automatically
+!IF !DEFINED(MAKENSIS)
+!IF EXIST("$(PROGRAM_FILES)\NSIS\makensis.exe")
MAKENSIS="$(PROGRAM_FILES)\NSIS\makensis.exe"
+!ELSE IF EXIST("$(PROGRAM_FILES_W6432)\NSIS\makensis.exe")
+MAKENSIS="$(PROGRAM_FILES_W6432)\NSIS\makensis.exe"
+!ENDIF
+!ENDIF
#
# Optional: To build the NSIS PortableApps installer.
# 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=$(PROGRAM_FILES)/HTML Help Workshop
+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)
##### Flags, PATHs and Miscellaneous #####
-# Santity check: Python embedding requires a valid PYTHON_DIR
-!IF DEFINED(PYTHON_EMBED) && !DEFINED(PYTHON_DIR)
-!ERROR PYTHON_EMBED requires that PYTHON_DIR is defined
-!ENDIF
-
# "convert" the MSVC variant into the required MSC compiler version
!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
MSC_VER_REQUIRED=1400
MSC_VER_REQUIRED=1600
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE"
MSC_VER_REQUIRED=1700
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE"
+MSC_VER_REQUIRED=1800
!ELSE
!ERROR MSVC_VARIANT unknown
!ENDIF
MANIFEST_INFO_REQUIRED=1
!ENDIF
-## VS2012 (VC11): configure subsystem version
+## VS2012 (VC11) and later: configure subsystem version
## See: https://blogs.msdn.com/b/vcblog/archive/2012/10/08/10357555.aspx
## (APPVER used in win32.mak to set subsystem version)
-!IF ($(MSC_VER_REQUIRED) == 1700)
+!IF ($(MSC_VER_REQUIRED) >= 1700)
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
APPVER=5.01
!else
# /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.
-#
+# -DPSAPI_VERSION=1 Programs that must run on earlier versions of Windows as well as Windows 7 and later
+# versions should always call this function as GetProcessMemoryInfo. To ensure correct
+# resolution of symbols, add Psapi.lib to the TARGETLIBS macro and compile the program
+# with -DPSAPI_VERSION=1.To use run-time dynamic linking, load Psapi.dll.
+# http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx
+# -DBUILD_WINDOWS Starting from VS2013, GetVersionEx is deprecated and we are recommended to use
+# VerifyVersionInfo instead
+# http://msdn.microsoft.com/en-us/library/windows/desktop/ms724429(v=vs.85).aspx
+# http://msdn.microsoft.com/en-us/library/windows/desktop/ms725491(v=vs.85).aspx
+# To continue to use GetVersionEx, we can define BUILD_WINDOWS
+# -D_ALLOW_KEYWORD_MACROS For VS2012 onwards the, C++ STL does not permit macro redefinitions of keywords
+# (see http://msdn.microsoft.com/en-us/library/bb531344(v=vs.110).aspx)
+# This definition prevents the complaint about the redefinition of inline by WinPCap
+# in pcap-stdinc.h when compiling CPP files, e.g. the QT UI
+#
+# -O2 http://msdn.microsoft.com/en-us/library/8f8h5cxt.aspx
+# Specifying the /O2 compiler option is the same as using the following options:
+# /Ob (Inline Function Expansion), where the option parameter is 2 (/Ob2)
+# /Og (Global Optimizations)
+# /Oi (Generate Intrinsic Functions)
+# /Ot (Favor Fast Code)
+# /Oy (Frame-Pointer Omission)
+# /Gs (Buffer Security Check)
+# /GF (Eliminate Duplicate Strings)
+# /Gy (Enable Function-Level Linking)
+
##Note: LOCAL_CFLAGS are flags used for *all* compilations
## STANDARD_CFLAGS (see below) are flags used just for *Wireshark* compilations
!IF "$(MSVC_VARIANT)" == "MSVC2005" || \
"$(MSVC_VARIANT)" == "MSVC2010" || \
"$(MSVC_VARIANT)" == "MSVC2010EE" || \
"$(MSVC_VARIANT)" == "MSVC2012" || \
- "$(MSVC_VARIANT)" == "MSVC2012EE"
-LOCAL_CFLAGS=/Zi /W3 /MD /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \
- /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
+ "$(MSVC_VARIANT)" == "MSVC2012EE" || \
+ "$(MSVC_VARIANT)" == "MSVC2013" || \
+ "$(MSVC_VARIANT)" == "MSVC2013EE"
+LOCAL_CFLAGS=/Zi /W3 /MD /O2 /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \
+ /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE -DPSAPI_VERSION=1
+
+!IF "$(MSVC_VARIANT)" == "MSVC2012" || \
+ "$(MSVC_VARIANT)" == "MSVC2012EE" || \
+ "$(MSVC_VARIANT)" == "MSVC2013" || \
+ "$(MSVC_VARIANT)" == "MSVC2013EE"
+LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_ALLOW_KEYWORD_MACROS
+!ENDIF
+
+!IF "$(MSVC_VARIANT)" == "MSVC2013" || \
+ "$(MSVC_VARIANT)" == "MSVC2013EE"
+LOCAL_CFLAGS=$(LOCAL_CFLAGS) /DBUILD_WINDOWS
+!ENDIF
!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1
"$(MSVC_VARIANT)" == "MSVC2010" || \
"$(MSVC_VARIANT)" == "MSVC2010EE" || \
"$(MSVC_VARIANT)" == "MSVC2012" || \
- "$(MSVC_VARIANT)" == "MSVC2012EE"
+ "$(MSVC_VARIANT)" == "MSVC2012EE" || \
+ "$(MSVC_VARIANT)" == "MSVC2013" || \
+ "$(MSVC_VARIANT)" == "MSVC2013EE"
LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
!ENDIF
!ENDIF
#STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
-STANDARD_CFLAGS=/DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
+STANDARD_CFLAGS=/DWINPCAP_VERSION=$(WINPCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
# Optional: Define WIRESHARK_GENERATE_BSC_FILE to generate .sbr files for input to bscmake
!IFDEF WIRESHARK_GENERATE_BSC_FILE
#
# install (debug) directory for Wireshark (relative to your source dir)
INSTALL_DIR=wireshark-gtk2
+INSTALL_DIR_QT=wireshark-qt-release
-
+#
+# Lacking a better way, define the Qt version used here
+QT_VERSION=5.2
##### C-Runtime Redistributable #####
#
# You can either place the redistributable in its own platform-
# and compiler-specific directory or in the top-level library
# directory.
+# Microsoft maintains a list of the latest redistributables in
+# KB 20197667: http://support.microsoft.com/kb/2019667
!IF EXIST("$(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT)")
VCREDIST_DIR=$(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT)
!ELSE
# with Visual Studio 2010.
#
MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.*
-!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012"
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE"
+#
+# EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227
#
-# For MSVC 2012 non-Express Edition, we "Install a particular Visual C++
+# For MSVC 2012, we "Install a particular Visual C++
# assembly as a private assembly for the application", by copying
# the contents of the Microsoft.VC110.CRT folder to the target directory.
# This is done to reduce the size of the installer; it also makes
# with Visual Studio 2010.
#
MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 11.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC110.CRT\*.*
-
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE"
+#
+# EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227
+#
+# For MSVC 2013, we "Install a particular Visual C++
+# assembly as a private assembly for the application", by copying
+# the contents of the Microsoft.VC120.CRT folder to the target directory.
+# This is done to reduce the size of the installer; it also makes
+# a portable version work, as the C runtime doesn't have to be
+# installed on the target machine.
+#
+# Note: for what it's worth, Microsoft recommends "Using the Visual C++
+# Redistributable Package", rather than "Installing a particular Visual
+# C++ assembly as a private assembly for the application", starting
+# with Visual Studio 2010.
+#
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 12.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC120.CRT\*.*
!ELSE
!ERROR MSVC_VARIANT unknown
!ENDIF
# the XML validator (part of cygwin's libxml2 package)
XMLLINT="xmllint"
-
+# Asciidoc converter (part of cygwin's asciidoc package). In order to build
+# the release notes you must have the Cygwin asciidoc and lynx packages
+# installed.
+A2X=a2x
+LYNX=lynx
##############################################################################
#
# 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
+# http://www.wireshark.org/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
WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO)
RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)
+FTAP_VERSION=$(FTAP_VERSION_MAJOR).$(FTAP_VERSION_MINOR).$(FTAP_VERSION_MICRO)
+RC_FTAP_VERSION=$(FTAP_VERSION_MAJOR),$(FTAP_VERSION_MINOR),$(FTAP_VERSION_MICRO)
# GLib
GLIB_CFLAGS=/I$(GTK_DIR)\include\glib-$(GLIB_VERSION) \
GTK_LIB_DIR=2.10.0
-!IFDEF PNG_DLL
-NEED_PNG_DLL=USE
+!IFDEF HARFBUZZ_DLL
+NEED_HARFBUZZ_DLL=USE
!ENDIF
!IFDEF JPEG_DLL
NEED_JPEG_DLL=USE
!ENDIF
+!IFDEF PNG_DLL
+NEED_PNG_DLL=USE
+!ENDIF
+!IFDEF SEH_DLL
+NEED_SEH_DLL=USE
+!ENDIF
+!IFDEF SJLJ_DLL
+NEED_SJLJ_DLL=USE
+!ENDIF
!IFDEF TIFF_DLL
NEED_TIFF_DLL=USE
!ENDIF
NEED_CAIRO_DLL=USE
# Pango >=1.24.5 Needs these:
-NEED_FREETYPE_DLL=USE
-NEED_FONTCONFIG_DLL=USE
#NEED_EXPAT_DLL=USE
-NEED_XML_DLL=USE
-NEED_PIXMAN_DLL=USE
NEED_FFI_DLL=USE
+NEED_FONTCONFIG_DLL=USE
+NEED_FREETYPE_DLL=USE
NEED_JASPER_DLL=USE
NEED_JPEG_DLL=USE
-NEED_TIFF_DLL=USE
NEED_LZMA_DLL=USE
+NEED_PIXMAN_DLL=USE
+NEED_XML_DLL=USE
-!ELSEIF "$(GTK_INST_VERSION)" == "3.4"
+!ELSEIF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6"
# GTK+
+## Note: If Wireshark is ever to be built with Gtk >= 3.10
+## then -DGTK_DISABLE_DEPRECATED must be removed
+## and -DGDK_DISABLE_DEPRECIATION_WARNINGS must
+## be added below.
+## Wireshark changes to handle Gtk 3.10 deprecated features
+## will not be done since Wireshark is moving to Qt.
GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-3.0 \
/I$(GTK_DIR)\include\gdk-pixbuf-2.0 \
/I$(GTK_DIR)\lib\gtk-3.0\include \
!IFDEF FREETYPE_DLL
NEED_FREETYPE_DLL=USE
!ENDIF
+!IFDEF HARFBUZZ_DLL
+NEED_HARFBUZZ_DLL=USE
+!ENDIF
!IFDEF JASPER_DLL
NEED_JASPER_DLL=USE
!ENDIF
!IFDEF PNG_DLL
NEED_PNG_DLL=USE
!ENDIF
+!IFDEF SEH_DLL
+NEED_SEH_DLL=USE
+!ENDIF
+!IFDEF SJLJ_DLL
+NEED_SJLJ_DLL=USE
+!ENDIF
!IFDEF TIFF_DLL
NEED_TIFF_DLL=USE
!ENDIF
KFW_CONFIG=
!ENDIF
-!IFDEF NETTLE_DIR
-NETTLE_CFLAGS=/I$(NETTLE_DIR)
-NETTLE_LIBS=$(NETTLE_DIR)\libnettle.lib
-# Nmake uses carets to escape special characters
-NETTLE_CONFIG=^#define HAVE_LIBNETTLE 1
-!else
-NETTLE_CFLAGS=
-NETTLE_LIBS=
-NETTLE_CONFIG=
-!ENDIF
-
!IFDEF GNUTLS_PKG
GNUTLS_DIR=$(WIRESHARK_LIB_DIR)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
GNUTLS_PATH=$(GNUTLS_DIR)
# /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash
GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL
-GCRYPT_LIBS = $(GNUTLS_DIR)\bin\libgcrypt-11.lib
+GCRYPT_LIBS = $(GNUTLS_DIR)\bin\libgcrypt-20.lib
GNUTLS_LIBS=\
- $(GNUTLS_DIR)\bin\libtasn1-3.lib \
+ $(GNUTLS_DIR)\bin\libtasn1-6.lib \
+!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
$(GNUTLS_DIR)\bin\libgpg-error-0.lib \
+!ELSE
+ $(GNUTLS_DIR)\bin\libgpg-error6-0.lib \
+!ENDIF
$(GCRYPT_LIBS) \
- $(GNUTLS_DIR)\bin\libgnutls-26.lib
+ $(GNUTLS_DIR)\bin\libgnutls-28.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)\lua5.1.lib
+LUA_LIBS=$(LUA_DIR)\lua52.lib
# Nmake uses carets to escape special characters
LUA_CONFIG=^#define HAVE_LUA 1
LUA_VERSION=^#define HAVE_LUA 1
LUA_CONFIG=
!ENDIF
-!IF DEFINED(PYTHON_EMBED)
-PYTHON_CFLAGS=/I$(PYTHON_DIR)\include
-PYTHON_LIBS=$(PYTHON_DIR)\libs\python$(PYTHON_VER).lib
-# Nmake uses carets to escape special characters
-PYTHON_CONFIG=^#define HAVE_PYTHON 1
-!else
-PYTHON_CFLAGS=
-PYTHON_LIBS=
-PYTHON_CONFIG=
-!ENDIF
-
!IFDEF PORTAUDIO_DIR
# Nmake uses carets to escape special characters
PORTAUDIO_CONFIG=^#define HAVE_LIBPORTAUDIO 1
git.samba.org / metze / wireshark / wip.git / blobdiff