# The current Wireshark version
# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
VERSION_MAJOR=1
-VERSION_MINOR=5
+VERSION_MINOR=7
VERSION_MICRO=0
VERSION_BUILD=0
# It's recommended to change VERSION_EXTRA for your own custom builds
# 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
# 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
#
# If you don't have NASM, comment this line out, so that NASM
# isn't defined.
#
-NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
+NASM=$(WIRESHARK_LIBS)\nasm-2.09.08\nasm.exe
#
# Optional: the Python library enables scripting support.
# PYTHON_EMBED isn't defined.
#
# NOTE: The Python library must have been compiled with the same
-# compiler (MSVC_VARIANT) as Wireshark. Kown python.org Python
+# compiler (MSVC_VARIANT) as Wireshark. Known python.org Python
# CRT versions:
#
# Python version CRT (32-bit) CRT (64-bit)
PATH=$(PYTHON_DIR);$(PATH)
!ENDIF
+##### To Use packet editor uncomment this line ####
+### Warning Experimental - work in progress
+#WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1
+
+##### To use UIManager insted of GtkItemFactory comment out this line NOTE not completly implemented yet some menus will be missing####
+#MAIN_MENU_USE_UIMANAGER=^#define MAIN_MENU_USE_UIMANAGER 1
+
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
##### Win32 Libraries #####
#
#
GLIB_VERSION=2.0
-##### To use the old packet list comment out this line ####
-NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
-
#
# Mandatory: GLib, GTK & related library settings
#
EXPAT_DLL=libexpat-1.dll
INTL_DLL=intl.dll
# This macro is used by the setup target.
-GTK_PKG=2.16.6-20100912
-#GTK_PKG=2.22.0-20101016
+#GTK_PKG=2.16.6-20100912
+GTK_PKG=2.22.1-20101227
#
# 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
-#GTK_INST_VERSION=2.22
+#GTK_INST_VERSION=2.16
+GTK_INST_VERSION=2.22
#
# Optional: WinPcap developer's pack to capture network traffic.
#
# If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
# defined.
-#
-ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
+# EXperimental only use zlib 1.2.5 on win32 for now
+ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
#
# Optional: the ADNS library enables asynchronous (nonblocking) DNS
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.8.5-4.12
+GNUTLS_PKG=2.10.3-1.11
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
#
GLIB_VERSION=2.0
-##### To use the old packet list comment out this line ####
-NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1
-
#
# Mandatory: GLib, GTK & related library settings
#
INTL_DLL=libintl-8.dll
# These macros are used by the setup target.
-GTK_PKG=2.16.6-20100912
-#GTK_PKG=2.22.0-20101016
+#GTK_PKG=2.16.6-20100912
+GTK_PKG=2.22.1-20101229
#
# 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
-#GTK_INST_VERSION=2.22
+#GTK_INST_VERSION=2.16
+GTK_INST_VERSION=2.22
#
# Optional: WinPcap developer's pack to capture network traffic.
# If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
# defined.
#
-ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
+ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
#
# Optional: the ADNS library enables asynchronous (nonblocking) DNS
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.8.5-3.16
+GNUTLS_PKG=2.10.3-1.7
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
# 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.
!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 are flags used for *all* compilations
+## STANDARD_CFLAGS (see below) are flags used just for *Wireshark* 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
+
+!IFDEF ENABLE_CODE_ANALYSIS
+LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX-
+!ENDIF
+
+#STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
+STANDARD_CFLAGS=-DHAVE_CONFIG_H -D_U_="" $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
+
+#Comment out the following if warnings are not to be treated as errors
+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
DLL_LDFLAGS = /MANIFEST:no
!ENDIF
+# Enable Safe Exception Handler.
+# http://msdn.microsoft.com/en-us/magazine/cc337897.aspx
+!IF $(MSC_VER_REQUIRED) >= 1300
+LOCAL_CFLAGS= $(LOCAL_CFLAGS) /GS
+!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
+LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /SafeSEH
+!ENDIF
+!ENDIF
+
# Enable ASLR. Requires VS2008 or later.
# http://blogs.msdn.com/b/vcblog/archive/2009/05/21/dynamicbase-and-nxcompat.aspx
-# DEP is handled in init_process_policies()
+# DEP (/NXCompat) is handled in init_process_policies() via SetProcessDEPPolicy.
# ASLR http://msdn.microsoft.com/en-us/library/bb384887.aspx
!IF $(MSC_VER_REQUIRED) >= 1500
-LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE
+LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE /FIXED:no
!ENDIF
PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) $(DLL_LDFLAGS)
# 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
# You may want to install the FOP hyphenation patterns from
# http://offo.sourceforge.net/hyphenation/
!IFNDEF FOP
-FOP=fop-0.95\fop.bat
+FOP=fop-1.0\fop.bat
!ENDIF
# Additional options to fop.
VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_BUILD)
+PRODUCT_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)
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=
git.samba.org / obnox / wireshark / wip.git / blobdiff