!ENDIF
##### Target platform #####
+
+# 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
+!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=11
+VERSION_MICRO=3
+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
# 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
+#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.
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 #####
# If you want building with GTK+, set GTK_DIR to the pathname of the
# directory in which the "include" and "lib" directories reside.
#
-# Set the name to gtk3 if you want to use gtk3
-GTK_NAME=gtk2
+# Set the name to gtk2 if you want to use gtk2
+GTK_NAME=gtk3
GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
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
+# 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
#
#
# 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
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
#
#
# 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
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)
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 VS2103, 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
#
##Note: LOCAL_CFLAGS are flags used for *all* compilations
## STANDARD_CFLAGS (see below) are flags used just for *Wireshark* compilations
"$(MSVC_VARIANT)" == "MSVC2010" || \
"$(MSVC_VARIANT)" == "MSVC2010EE" || \
"$(MSVC_VARIANT)" == "MSVC2012" || \
- "$(MSVC_VARIANT)" == "MSVC2012EE"
+ "$(MSVC_VARIANT)" == "MSVC2012EE" || \
+ "$(MSVC_VARIANT)" == "MSVC2013" || \
+ "$(MSVC_VARIANT)" == "MSVC2013EE"
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
+ /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
# 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) \
NEED_TIFF_DLL=USE
NEED_LZMA_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 \
git.samba.org / metze / wireshark / wip.git / blobdiff