# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
VERSION_MAJOR=1
VERSION_MINOR=5
-VERSION_MICRO=0
+VERSION_MICRO=1
VERSION_BUILD=0
# It's recommended to change VERSION_EXTRA for your own custom builds
# e.g. "-SVN-12345"
# 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".
+# PROCESSOR_ARCHITECTURE (Used for redistributable packages and
+# manifests) should be one of "x86" or "amd64".
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
TARGET_MACHINE=x86
CPU=i386
-VCREDIST_DLL=x86
+PROCESSOR_ARCHITECTURE=x86
!else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
TARGET_MACHINE=x64
CPU=AMD64
-VCREDIST_DLL=amd64
+PROCESSOR_ARCHITECTURE=amd64
!else
!error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us.
!endif
##### Microsoft Visual C / Studio Variant #####
-# for the different Studios, see: http://en.wikipedia.org/wiki/Microsoft_Visual_Studio
+# For the different Studios, see: http://en.wikipedia.org/wiki/Microsoft_Visual_Studio
# only one of the following MSVC_VARIANT settings should be used
# BTW: The "Microsoft Visual C++ Toolkit 2003" DOESN'T WORK for WS!
# "Microsoft Visual Studio 2008"
# Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll
-MSVC_VARIANT=MSVC2008
+#MSVC_VARIANT=MSVC2008
# "Microsoft Visual C++ 2008 Express Edition"
# Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll
#MSVC_VARIANT=MSVC2008EE
-# Warning, building with this setting does not work yet
# "Microsoft Visual Studio 2010"
# Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll
#MSVC_VARIANT=MSVC2010
-# Warning, building with this setting does not work yet
# "Microsoft Visual C++ 2010 Express Edition"
# Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll
#MSVC_VARIANT=MSVC2010EE
+# The default if we haven't set a system environment variable or
+# uncommented an entry above.
+!IFNDEF MSVC_VARIANT
+MSVC_VARIANT=MSVC2008
+!ENDIF
+
#
# Optional: To compile some time critical code from assembler instead of C
#
#
# Optional: the Python interpreter is used as part of the buildsystem
#
-# If you have the Python interpreter, set this to the directory in which
-# the Python package is stored
-#
-# If you don't have the Python interpreter, comment this line out, so that
-# PYTHON_DIR isn't defined.
+# This will override the automatic detection below.
+#PYTHON_VER=27
+#PYTHON_DIR=C:\Python$(PYTHON_VER)
+
#
-# V2.4 to V2.6 should work
+# If you don't have the native Python package installed, you can use
+# the Cygwin version (not recommended)
#
-#PYTHON_VER=26
-#PYTHON_DIR=C:\Python$(PYTHON_VER)
+#PYTHON=env python
+
+# Santity check: native vs Cygwin Python options
+!IF DEFINED(PYTHON) && DEFINED(PYTHON_DIR)
+!ERROR PYTHON and PYTHON_DIR cannot be specified at the same time
+!ENDIF
+
+# Find native Python automatically if PYTHON(_DIR) wasn't defined
+!IF !DEFINED(PYTHON) && !DEFINED(PYTHON_DIR)
+!IF EXIST(c:\Python27\python.exe)
+PYTHON_VER=27
+!ELSE IF EXIST(c:\Python26\python.exe)
+PYTHON_VER=26
+!ELSE IF EXIST(c:\Python25\python.exe)
+PYTHON_VER=25
+!ELSE IF EXIST(c:\Python24\python.exe)
+PYTHON_VER=24
+!ENDIF
+
+!IF DEFINED(PYTHON_VER)
+PYTHON_DIR=C:\Python$(PYTHON_VER)
+!ENDIF
+!ENDIF
+!IF DEFINED(PYTHON_DIR)
+PYTHON="$(PYTHON_DIR)\python.exe"
+PATH=$(PYTHON_DIR);$(PATH)
+!ENDIF
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
##### Win32 Libraries #####
EXPAT_DLL=libexpat-1.dll
INTL_DLL=intl.dll
# This macro is used by the setup target.
-GTK_PKG=2.16.6-20100207
+GTK_PKG=2.16.6-20100912
+#GTK_PKG=2.22.0-20101016
#
# Mandatory: Version numbers of GTK and pango.
# These macros are used by the nsis installer script and by the setup target.
#
GTK_INST_VERSION=2.16
+#GTK_INST_VERSION=2.22
#
# Optional: WinPcap developer's pack to capture network traffic.
INTL_DLL=libintl-8.dll
# These macros are used by the setup target.
-GTK_PKG=2.16.6-20100208
+GTK_PKG=2.16.6-20100912
+#GTK_PKG=2.22.0-20101016
#
# Mandatory: Version numbers of GTK and pango.
# These macros are used by the nsis installer script and by the setup target.
#
GTK_INST_VERSION=2.16
+#GTK_INST_VERSION=2.22
#
# Optional: WinPcap developer's pack to capture network traffic.
POD2MAN=$(SH) pod2man
POD2HTML=$(SH) pod2html
-#
-# If you don't have the native Python package installed, you can use
-# the Cygwin version (not recommended)
-#
-#PYTHON=env python
-
# command for lex/flexx (cygwin's flex recommended)
LEX=flex
# If you don't have NSIS, comment this line out, so that MAKENSIS
# isn't defined.
#
-MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe"
+MAKENSIS="$(PROGRAM_FILES)\NSIS\makensis.exe"
+
+#
+# Optional: To build the NSIS PortableApps installer.
+#
+# If you have the NSIS Unicode package, set this to the NSIS Unicode executable.
+#
+# If you don't have NSIS Unicode, comment this line out, so that
+# MAKENSIS_UNICODE isn't defined.
+#
+MAKENSIS_UNICODE="$(PROGRAM_FILES)\NSIS\Unicode\makensis.exe"
#
# Optional: To build the developers API documentation with doxygen and dot.
##### Flags, PATHs and Miscellaneous #####
-# Santity check: native vs Cygwin Python options
-!IF DEFINED(PYTHON) && DEFINED(PYTHON_DIR)
-!ERROR PYTHON and PYTHON_DIR cannot be specified at the same time
-!ENDIF
-
-# Find native Python automatically if PYTHON(_DIR) wasn't defined
-!IF !DEFINED(PYTHON) && !DEFINED(PYTHON_DIR)
-!IF EXIST(c:\Python26\python.exe)
-PYTHON_VER=26
-!ELSE IF EXIST(c:\Python25\python.exe)
-PYTHON_VER=25
-!ELSE IF EXIST(c:\Python24\python.exe)
-PYTHON_VER=24
-!ENDIF
-
-!IF DEFINED(PYTHON_VER)
-PYTHON_DIR=C:\Python$(PYTHON_VER)
-!ENDIF
-!ENDIF
-
-!IF DEFINED(PYTHON_DIR)
-PYTHON="$(PYTHON_DIR)\python.exe"
-PATH=$(PYTHON_DIR);$(PATH)
-!ENDIF
-
# 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
# Compiler flags:
-# /W3 warning level 3 (0 less - 4 most, 1 default)
-# /Zi create .pdb file for debugging
-# /MD use "Multithreading Debug" libraries
-# /D_CRT_SECURE_NO_DEPRECATE Don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT"
+# /W3 Warning level 3 (0 less - 4 most, 1 default)
+# /Zi Create .pdb file for debugging
+# /MD Use "multithread- and DLL-specific version" of run-time libraries
+# msvc documentation states that /MD causes _MT and _DLL to be defined
+# See: http://msdn.microsoft.com/en-us/library/2kzt1wy3%28v=VS.90%29.aspx
+# /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)
+# /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"
+# /MANIFEST:no Don't create a SxS manifest. Makes sure our plugins don't load
+# a second copy of the CRT.
+#
+##Note: LOCAL_CFLAGS is used used for *all* compilations
+!IF "$(MSVC_VARIANT)" == "MSVC6" || \
+ "$(MSVC_VARIANT)" == "MSVC2002" || \
+ "$(MSVC_VARIANT)" == "DOTNET10" || \
+ "$(MSVC_VARIANT)" == "MSVC2003" || \
+ "$(MSVC_VARIANT)" == "DOTNET11"
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" || "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE"
-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)
+
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || \
+ "$(MSVC_VARIANT)" == "MSVC2005EE" || \
+ "$(MSVC_VARIANT)" == "DOTNET20" || \
+ "$(MSVC_VARIANT)" == "MSVC2008" || \
+ "$(MSVC_VARIANT)" == "MSVC2008EE" || \
+ "$(MSVC_VARIANT)" == "MSVC2010" || \
+ "$(MSVC_VARIANT)" == "MSVC2010EE"
+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
+
!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1
!ENDIF
+
+# Additional compiler warnings to be treated as "Level 3"
+# when compiling Wireshark sources. (Selected from "level 4" warnings).
+## 4295: array is too small to include a terminating null character
+WARNINGS_CFLAGS=/w34295
+
!ELSE
!ERROR MSVC_VARIANT unknown
!ENDIF
# * /showIncludes
# * /Yc
#
-!IF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" || "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE"
+!IF "$(MSVC_VARIANT)" == "MSVC2008" || \
+ "$(MSVC_VARIANT)" == "MSVC2008EE" || \
+ "$(MSVC_VARIANT)" == "MSVC2010" || \
+ "$(MSVC_VARIANT)" == "MSVC2010EE"
LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
!ENDIF
+# Optional: Static analysis. Only supported in the full-frontal MSVC editions.
+# http://msdn.microsoft.com/en-us/library/ms182025.aspx
+
+#!IF "$(MSVC_VARIANT)" == "MSVC2010" && "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
+#LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze
+#!ENDIF
+
+#STANDARD_CFLAGS is used only for Wireshark source compiles
+STANDARD_CFLAGS=-DHAVE_CONFIG_H -D_U_="" $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
+
+WARNINGS_ARE_ERRORS=-WX
+
+## XXX: _MT and _DLL are defined when /MD is used so CVARSDLL is apparently unneeded
+##CVARSDLL=-D_MT -D_DLL
+
# Linker flags:
# /DEBUG generate debug info
# /PROFILE generate map file(s) for profiling
# no redistributable available for this package!
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005"
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(VCREDIST_DLL)\Microsoft.VC80.CRT\*.*
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC80.CRT\*.*
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE"
# you need to download the redistributable package vcredist_x86.exe from Microsoft first,
VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008"
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(VCREDIST_DLL)\Microsoft.VC90.CRT\*.*
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.*
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE"
-# NOT TESTED
# 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_$(TARGET_MACHINE).exe
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010"
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT*.*
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.*
!ELSE
!ERROR MSVC_VARIANT unknown
# GTK+
GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \
+ /I$(GTK_DIR)\include\gdk-pixbuf-2.0 \
/I$(GTK_DIR)\lib\gtk-2.0\include \
/I$(GTK_DIR)\include\atk-1.0 \
/I$(GTK_DIR)\include\cairo \
$(GTK_DIR)\lib\pango-1.0.lib \
$(GLIB_LIBS)
-
-!IF "$(GTK_INST_VERSION)" == "2.18" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14"
+# 2.18 was no good(Theming problem)
+!IF "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14"
GTK_LIB_DIR=2.10.0
!IFDEF PNG_DLL
PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1
PCAP_FREE_DATALINKS_CONFIG=^#define HAVE_PCAP_FREE_DATALINKS 1
PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1
+PCAP_OPEN_DEAD_CONFIG=^#define HAVE_PCAP_OPEN_DEAD 1
+BPF_IMAGE_CONFIG=^#define HAVE_BPF_IMAGE 1
!ELSE
# no WpdPack installed
WINPCAP_CONFIG=
PCAP_LIST_DATALINKS_CONFIG=
PCAP_FREE_DATALINKS_CONFIG=
PCAP_SET_DATALINK_CONFIG=
+PCAP_OPEN_DEAD_CONFIG=
+BPF_IMAGE_CONFIG=
!ENDIF
!IF DEFINED(PCAP_DIR) && DEFINED(PCAP_REMOTE)
ZLIB_DLL=$(ZLIB_DIR)\zlib1.dll
# Nmake uses carets to escape special characters
ZLIB_CONFIG=^#define HAVE_LIBZ 1
+ZLIB_GZCLEARERR_CONFIG=^#define HAVE_GZCLEARERR 1
!else
ZLIB_CFLAGS=
ZLIB_LIBS=