# Some more information about the settings in this file can be found in
# the file README.windows and the Developer's Guide (available online).
+##### Program name #####
+# Changing the name is experimental and may break the installer/unistaller and possibly other stuff.
+# Application data will still be under the same dir as Wireshark so perference files profiles etc
+# will be shared with a "normal" Wireshark installation.
+# Note that suport libararies needs to be in PROGRAM_NAME-libs...
+
+!IFNDEF PROGRAM_NAME
+PROGRAM_NAME=Wireshark
+!ENDIF
+
##### Target platform #####
# Only "win32" and "win64" are valid (for now).
# This can be defined in the system environment.
##### Versions #####
-# The current Wireshark version
-# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
+# The SVN revision of our build. Updated by make-version.pl
+SVN_REVISION=0
+
+# The current Wireshark version. Recommended: Leave unchanged.
+# Updated by make-version.pl
VERSION_MAJOR=1
-VERSION_MINOR=7
+VERSION_MINOR=11
VERSION_MICRO=0
-VERSION_BUILD=0
-# It's recommended to change VERSION_EXTRA for your own custom builds
-# e.g. "-SVN-12345"
-VERSION_EXTRA=
+VERSION_BUILD=$(SVN_REVISION)
-# The version of the wiretap library (recommended: leave unchanged)
-WTAP_VERSION_MAJOR=1
-WTAP_VERSION_MINOR=7
-WTAP_VERSION_MICRO=0
+# Local build information. Recommended: Unique string for your
+# environment, e.g. "-JackStackBarbecue". Updated by make-version.pl
+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
##### Directories #####
# This can be defined in the system environment.
#
!IFNDEF WIRESHARK_LIB_DIR
-WIRESHARK_LIB_DIR=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
+WIRESHARK_LIB_DIR=C:\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs
!ENDIF
#
##### 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
-# BTW: The "Microsoft Visual C++ Toolkit 2003" DOESN'T WORK for WS!
-
-# "Microsoft Visual Studio 6.0"
-# Visual C++ 6.0, _MSC_VER 1200, msvcrt.dll (version 6)
-#MSVC_VARIANT=MSVC6
-
-# "Microsoft Visual Studio .NET (2002)"
-# Visual C++ 7.0, _MSC_VER 1300, msvcr70.dll
-#MSVC_VARIANT=MSVC2002
-
-# "Microsoft .Net Framework SDK Version 1.0"
-# needs additional Platform SDK installation
-# Visual C++ 7.0, _MSC_VER 1300, msvcr70.dll
-#MSVC_VARIANT=DOTNET10
-
-# "Microsoft Visual Studio .NET 2003"
-# Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll
-#MSVC_VARIANT=MSVC2003
-
-# "Microsoft .Net Framework SDK Version 1.1"
-# needs additional Platform SDK installation
-# Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll
-#MSVC_VARIANT=DOTNET11
+# Only one of the following MSVC_VARIANT settings should be used
# "Microsoft Visual Studio 2005"
# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
# Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll
#MSVC_VARIANT=MSVC2010EE
+# "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*
+## 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
+## 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
+
+# "Microsoft Visual Studio 2012"
+# Visual C++ 11.0, _MSC_VER 1700, msvcr110.dll
+#MSVC_VARIANT=MSVC2012
+
# The default if we haven't set a system environment variable or
-# uncommented an entry above.
+# uncommented an entry above. We default to the version recommended
+# in the Developer's Guide, namely MSVC++ 2010 Express Edition.
!IFNDEF MSVC_VARIANT
-MSVC_VARIANT=MSVC2008
+MSVC_VARIANT=MSVC2010EE
!ENDIF
#
# Python version CRT (32-bit) CRT (64-bit)
# 2.4.4 7.1 ?
# 2.6.1 9.0 ?
-# 2.6.2 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.
### 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 #####
#
# 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_LIB_DIR)\gtk2
+# Set the name to gtk2 if you want to use gtk2
+GTK_NAME=gtk3
+GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
+
+
# These macros are used by the nsis installer script and by the install target.
-PNG_DLL=libpng14-14.dll
-FREETYPE_DLL=freetype6.dll
+#EXPAT_DLL=libexpat-1.dll
+FFI_DLL=libffi-5.dll
FONTCONFIG_DLL=libfontconfig-1.dll
-EXPAT_DLL=libexpat-1.dll
-INTL_DLL=intl.dll
+FREETYPE_DLL=libfreetype-6.dll
+INTL_DLL=libintl-8.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
+TIFF_DLL=libtiff-5.dll
+XML_DLL=libxml2-2.dll
+
# This macro is used by the setup target.
-#GTK_PKG=2.16.6-20100912
-GTK_PKG=2.22.1-20101227
+!IF "$(GTK_NAME)" == "gtk2"
+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
+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
+!ENDIF
#
# 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
+!IF "$(GTK_NAME)" == "gtk2"
+GTK_INST_VERSION=2.24
+!ELSE
+GTK_INST_VERSION=3.4
+!ENDIF
#
# Optional: WinPcap developer's pack to capture network traffic.
#
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_2
+PCAP_VERSION=4_1_3
+WPD_VERSION=4_1_2
#
# Optional: WinPcap remote capture support and new API
# If you don't have c-ares, comment this line out, so that C_ARES_DIR
# isn't defined.
#
-C_ARES_PKG=1.7.1
+C_ARES_PKG=1.9.1-1
#
-# Optional: the GNUTLS library enables ssl decryption.
+# Optional: the GnuTLS library enables ssl decryption.
#
-# If you have the GNUTLS library, set this to the package version.
+# If you have the GnuTLS library, set this to the package version.
#
-# If you don't have GNUTLS, comment this line out, so that GNUTLS_PKG
+# If you don't have GnuTLS, comment this line out, so that GNUTLS_PKG
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.10.3-1.11
+GNUTLS_PKG=2.12.18-1.2
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
#
# 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_LIB_DIR)\GeoIP-1.4.6-win32ws\libGeoIP
-!ENDIF
+GEOIP_PKG=1.5.1-2
+
+#
+# Optional: WinSparkle, software updates
+#
+# Used for automatic software updates
+#
+WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws
!else
##### Win64 Libraries #####
# 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_LIB_DIR)\gtk2
+#
+# Set the name to gtk3 if you want to use gtk3 - (experimental ?)
+GTK_NAME=gtk2
+GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
+
# These macros are used by the nsis installer script and by the install target.
-PNG_DLL=libpng14-14.dll
-#TIFF_DLL=libtiff-3.dll
-#JPEG_DLL=libjpeg-7.dll
-FREETYPE_DLL=libfreetype-6.dll
+#EXPAT_DLL=libexpat-1.dll
+FFI_DLL=libffi-5.dll
FONTCONFIG_DLL=libfontconfig-1.dll
-EXPAT_DLL=libexpat-1.dll
+FREETYPE_DLL=libfreetype-6.dll
INTL_DLL=libintl-8.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
+TIFF_DLL=libtiff-5.dll
+XML_DLL=libxml2-2.dll
# These macros are used by the setup target.
-#GTK_PKG=2.16.6-20100912
-GTK_PKG=2.22.1-20101229
+!IF "$(GTK_NAME)" == "gtk2"
+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
+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
+!ENDIF
#
# 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.
#
+!IF "$(GTK_NAME)" == "gtk2"
#GTK_INST_VERSION=2.16
-GTK_INST_VERSION=2.22
+GTK_INST_VERSION=2.24
+!ELSE
+GTK_INST_VERSION=3.4
+!ENDIF
#
# Optional: WinPcap developer's pack to capture network traffic.
#
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_2
+PCAP_VERSION=4_1_3
+WPD_VERSION=4_1_2
#
# Optional: WinPcap remote capture support and new API
# If you don't have c-ares, comment this line out, so that C_ARES_DIR
# isn't defined.
#
-C_ARES_PKG=1.7.1
+C_ARES_PKG=1.9.1-1
#
-# Optional: the GNUTLS library enables ssl decryption.
+# Optional: the GnuTLS library enables ssl decryption.
#
-# If you have the GNUTLS library, set this to the package version.
+# If you have the GnuTLS library, set this to the package version.
#
-# If you don't have GNUTLS, comment this line out, so that GNUTLS_PKG
+# If you don't have GnuTLS, comment this line out, so that GNUTLS_PKG
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.10.3-1.7
+GNUTLS_PKG=2.12.18-1.2-1
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
# 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_DIST=-5.1.4_Win64_dll10
LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4
#
#
# Used to map IP addresses to MaxMind GeoIP database entries
#
-GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win64ws\libGeoIP
+GEOIP_PKG=1.5.1-2
+
+#
+# Optional: WinSparkle, software updates
+#
+# Used for automatic software updates
+#
+WINSPARKLE_PKG=0.3-44-g2c8d9d3-win64ws
!endif
+##### win32 / win64 #####
+
+!IF "$(GTK_NAME)" == "gtk2"
+GTK_ETC_DIR=etc\gtk-2.0
+GTK_ENGINES_DIR=lib\gtk-2.0\$(GTK_LIB_DIR)\engines
+GTK_MODULES_DIR=lib\gtk-2.0\modules
+GTK_THEMES_DIR=share\themes\MS-Windows\gtk-2.0
+!ELSE
+GTK_ETC_DIR=etc\gtk-3.0
+GTK_SCHEMAS_DIR=\share\glib-2.0\schemas
+!ENDIF
+
##### Tools #####
#
# Recommended: Use the compressed html help format .chm as the Wireshark integrated help.
#
-# The required htmlhelp.h and htmlhelp.lib should be included in MSVC_VARIANT > MSVC6.
-#
-# For MSVC_VARIANT == MSVC6 you will have to download and install the html help workshop from:
-#
-# http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html
-# /hwMicrosoftHTMLHelpDownloads.asp
-#
-# Then point HHC_DIR to the html help dir (where hhc.exe resides).
+# The required htmlhelp.h and htmlhelp.lib should be included in versions of MSVC supported by Wireshark
#
# 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)
!ENDIF
# "convert" the MSVC variant into the required MSC compiler version
-!IF "$(MSVC_VARIANT)" == "MSVC6"
-MSC_VER_REQUIRED=1200
-!ELSEIF "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10"
-MSC_VER_REQUIRED=1300
-!ELSEIF "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11"
-MSC_VER_REQUIRED=1310
-!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
+!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
MSC_VER_REQUIRED=1400
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE"
MSC_VER_REQUIRED=1500
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE"
MSC_VER_REQUIRED=1600
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE"
+MSC_VER_REQUIRED=1700
!ELSE
!ERROR MSVC_VARIANT unknown
!ENDIF
MANIFEST_INFO_REQUIRED=1
!ENDIF
+## VS2012 (VC11): 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 "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
+APPVER=5.01
+!else
+APPVER=5.02
+!endif
+!ENDIF
+
# Compiler flags:
-# /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
+# /W3 Warning level 3 (0 less - 4 most, 1 default).
+# /Zi Create .pdb file for debugging.
+# /FR Create .sbr file with complete symbolic information.
+# add to standard CFLAGS if you want to build the .sbr files
+# for Wireshark compiles.
+# Warning: using /FR for Wireshark requires ~1Gig of additional disk space
+# XXX: provides less functionality for VC8, ... than for previous compilers ?
+# XXX: .bsc files not usable (not supported ?) with VC10 (Visual Studio 2010) ?
+# /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
+# /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)
+# /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
#
##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" || \
+!IF "$(MSVC_VARIANT)" == "MSVC2005" || \
"$(MSVC_VARIANT)" == "MSVC2005EE" || \
"$(MSVC_VARIANT)" == "DOTNET20" || \
"$(MSVC_VARIANT)" == "MSVC2008" || \
"$(MSVC_VARIANT)" == "MSVC2008EE" || \
"$(MSVC_VARIANT)" == "MSVC2010" || \
- "$(MSVC_VARIANT)" == "MSVC2010EE"
+ "$(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
+ /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE -DPSAPI_VERSION=1
!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1
!IF "$(MSVC_VARIANT)" == "MSVC2008" || \
"$(MSVC_VARIANT)" == "MSVC2008EE" || \
"$(MSVC_VARIANT)" == "MSVC2010" || \
- "$(MSVC_VARIANT)" == "MSVC2010EE"
+ "$(MSVC_VARIANT)" == "MSVC2010EE" || \
+ "$(MSVC_VARIANT)" == "MSVC2012" || \
+ "$(MSVC_VARIANT)" == "MSVC2012EE"
LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
!ENDIF
!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)
+STANDARD_CFLAGS=/DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
+
+# Optional: Define WIRESHARK_GENERATE_BSC_FILE to generate .sbr files for input to bscmake
+!IFDEF WIRESHARK_GENERATE_BSC_FILE
+STANDARD_CFLAGS= $(STANDARD_CFLAGS) /FR
+!ENDIF
#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
# packages, the following will use the default paths depending
# on the package version.
#
-!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_LIB_DIR)\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
-!ELSEIF "$(MSVC_VARIANT)" == "DOTNET10"
-# no redistributable available for this package!
-
-!ELSEIF "$(MSVC_VARIANT)" == "MSVC2003"
-# you probably need to tweak this directory if you don't use the professional edition!
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio .NET 2003\Visual Studio .NET Professional 2003 - English\msvcr71.dll
+# 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
+VCREDIST_DIR=$(WIRESHARK_LIB_DIR)
+!ENDIF
-!ELSEIF "$(MSVC_VARIANT)" == "DOTNET11"
-# no redistributable available for this package!
+!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
+#
+# For 64-bit platforms, we don't create portable packages and therefore
+# don't have to worry that "Using the Visual C++ Redistributable
+# Package" requires that an installer be run to install that package,
+# so we use that method to make the C runtime available.
+#
+VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005"
+#
+# For MSVC 2005 non-Express Edition, we "Install a particular Visual C++
+# assembly as a private assembly for the application", by copying
+# the contents of the Microsoft.VC80.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.
+#
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,
-# and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
+#
+# For MSVC 2005 Express Edition, for the .NET Framework 2.0 SDK, and
+# for MSVC 2008 Express Edition, we "Use the Visual C++ Redistributable
+# Package", because they don't provide the Microsoft.VC80.CRT folder.
+#
+# They also don't provide the redistributable package, so you need to
+# download the appropriate version of the redistributable package,
+# vcredist_x86.exe, vcredist_x64.exe, or vcredist_ia64.exe, from
+# Microsoft first, and copy it to the lib folder!!!
+#
+VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008"
+#
+# For MSVC 2008 non-Express Edition, we "Install a particular Visual C++
+# assembly as a private assembly for the application", by copying
+# the contents of the Microsoft.VC90.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.
+#
MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.*
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE"
-# you need to download the redistributable package vcredist_x86.exe from Microsoft first,
-# and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
+#
+# For MSVC 2010 Express Edition, we "Use the Visual C++ Redistributable
+# Package", because it doesn't provide the Microsoft.VC80.CRT folder.
+#
+# It also doesn't provide the redistributable package, so you need to
+# download the appropriate version of the redistributable package,
+# vcredist_x86.exe or vcredist_x64.exe, from Microsoft first, and copy
+# it to the lib folder!!!
+VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010"
+#
+# For MSVC 2010 non-Express Edition, we "Install a particular Visual C++
+# assembly as a private assembly for the application", by copying
+# the contents of the Microsoft.VC100.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 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.*
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012"
+#
+# For MSVC 2012 non-Express Edition, 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
+# 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 11.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC110.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
+# This is still optional yet we define it above for all users.
+# So, don't check if it exists...
+#!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
# 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
##############################################################################
#
# GLib
GLIB_CFLAGS=/I$(GTK_DIR)\include\glib-$(GLIB_VERSION) \
/I$(GTK_DIR)\lib\glib-$(GLIB_VERSION)\include \
- -DG_DISABLE_DEPRECATED
+ -DG_DISABLE_DEPRECATED \
+ -DG_DISABLE_SINGLE_INCLUDES
GLIB_LIBS=$(GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \
$(GTK_DIR)\lib\gmodule-$(GLIB_VERSION).lib \
$(GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib
GTHREAD_LIBS=$(GTK_DIR)\lib\gthread-$(GLIB_VERSION).lib
+
+# 2.18 was no good(Theming problem)
+!IF "$(GTK_INST_VERSION)" == "2.24" || "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14"
+
# GTK+
GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \
/I$(GTK_DIR)\include\gdk-pixbuf-2.0 \
/I$(GTK_DIR)\include\atk-1.0 \
/I$(GTK_DIR)\include\cairo \
/I$(GTK_DIR)\include\pango-1.0 \
- -DGTK_DISABLE_SINGLE_INCLUDES \
+ -DGDK_DISABLE_DEPRECATED \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_SINGLE_INCLUDES \
-DGSEAL_ENABLE
GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
$(GTK_DIR)\lib\gdk-win32-2.0.lib \
$(GTK_DIR)\lib\pangocairo-1.0.lib \
$(GLIB_LIBS)
-# 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
-NEED_LIBPNG_DLL=USE
+NEED_PNG_DLL=USE
!ENDIF
!IFDEF JPEG_DLL
-NEED_LIBJPEG_DLL=USE
+NEED_JPEG_DLL=USE
!ENDIF
!IFDEF TIFF_DLL
-NEED_LIBTIFF_DLL=USE
+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_EXPAT_DLL=USE
+NEED_XML_DLL=USE
+NEED_PIXMAN_DLL=USE
+NEED_FFI_DLL=USE
+NEED_JASPER_DLL=USE
+NEED_JPEG_DLL=USE
+NEED_TIFF_DLL=USE
+NEED_LZMA_DLL=USE
+
+!ELSEIF "$(GTK_INST_VERSION)" == "3.4"
-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
+# GTK+
+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 \
+ /I$(GTK_DIR)\include\atk-1.0 \
+ /I$(GTK_DIR)\include\cairo \
+ /I$(GTK_DIR)\include\pango-1.0 \
+ -DGDK_DISABLE_DEPRECATED \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_SINGLE_INCLUDES \
+ -DGSEAL_ENABLE
+GTK_LIBS=$(GTK_DIR)\lib\gtk-3.lib \
+ $(GTK_DIR)\lib\gdk-3.lib \
+ $(GTK_DIR)\lib\gdk_pixbuf-2.0.lib \
+ $(GTK_DIR)\lib\cairo.lib \
+ $(GTK_DIR)\lib\pango-1.0.lib \
+ $(GTK_DIR)\lib\pangocairo-1.0.lib \
+ $(GLIB_LIBS)
+
+GTK_LIB_DIR=3.4
+
+!IFDEF _DLL
+!ENDIF
+
+NEED_CAIRO_GOBJECT_DLL=USE
+NEED_CAIRO_DLL=USE
+
+!IFDEF EXPAT_DLL
+NEED_EXPAT_DLL=USE
+!ENDIF
+!IFDEF FFI_DLL
+NEED_FFI_DLL=USE
+!ENDIF
+!IFDEF FONTCONFIG_DLL
+NEED_FONTCONFIG_DLL=USE
+!ENDIF
+!IFDEF FREETYPE_DLL
+NEED_FREETYPE_DLL=USE
+!ENDIF
+!IFDEF JASPER_DLL
+NEED_JASPER_DLL=USE
+!ENDIF
+!IFDEF JPEG_DLL
+NEED_JPEG_DLL=USE
+!ENDIF
+!IFDEF LZMA_DLL
+NEED_LZMA_DLL=USE
+!ENDIF
+!IFDEF PIXMAN_DLL
+NEED_PIXMAN_DLL=USE
+!ENDIF
+!IFDEF PNG_DLL
+NEED_PNG_DLL=USE
+!ENDIF
+!IFDEF TIFF_DLL
+NEED_TIFF_DLL=USE
+!ENDIF
+!IFDEF XML_DLL
+NEED_XML_DLL=USE
+!ENDIF
!ELSE
-!ERROR ? Unknown or invalid GTK_INST_VERSION
+!ERROR ? Unknown or invalid GTK_INST_VERSION "$(GTK_INST_VERSION)"
!ENDIF
#AIRPCAP_CFLAGS=/I$(AIRPCAP_DIR)\include
!ELSE
AIRPCAP_CONFIG=
+WIRELESS_TOOLBAR_CONFIG=
!ENDIF
!IFDEF PCAP_DIR
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
+LUA_VERSION=^#define HAVE_LUA 1
!else
LUA_CFLAGS=
LUA_LIBS=
!ENDIF
!IFDEF HHC_DIR
-!IF "$(MSVC_VARIANT)" == "MSVC6"
-HHC_CFLAGS=/I"$(HHC_DIR)\include" -DHHC_DIR
-HHC_LIBS="$(HHC_DIR)\lib\htmlhelp.lib"
-!ELSE
HHC_CFLAGS=-DHHC_DIR
HHC_LIBS=htmlhelp.lib
-!ENDIF
!ELSE
HHC_CFLAGS=
HHC_LIBS=
SMI_CONFIG=
!ENDIF
-!IFDEF GEOIP_DIR
+!IFDEF GEOIP_PKG
+GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
GEOIP_CONFIG=^#define HAVE_GEOIP 1
-GEOIP_CFLAGS=/I$(GEOIP_DIR)
-GEOIP_LIBS=$(GEOIP_DIR)\GeoIP.lib
+GEOIP_V6_CONFIG=^#define HAVE_GEOIP_V6 1
+GEOIP_CFLAGS=/I$(GEOIP_DIR)/include
+GEOIP_LIBS=$(GEOIP_DIR)\lib\libGeoIP-1.lib
+!ELSE
+GEOIP_DIR=
+GEOIP_LIBS=
+GEOIP_CFLAGS=
+GEOIP_CONFIG=
+GEOIP_V6_CONFIG=
+!ENDIF
+
+!IFDEF WINSPARKLE_PKG
+WINSPARKLE_DIR=$(WIRESHARK_LIB_DIR)\WinSparkle-$(WINSPARKLE_PKG)
+WINSPARKLE_CONFIG=^#define HAVE_SOFTWARE_UPDATE 1
+WINSPARKLE_CFLAGS=/I$(WINSPARKLE_DIR)
+WINSPARKLE_LIBS=$(WINSPARKLE_DIR)\WinSparkle.lib
!ELSE
-GeoIP_LIBS=
-GeoIP_CFLAGS=
-GeoIP_CONFIG=
+WINSPARKLE_DIR=
+WINSPARKLE_CONFIG=
+WINSPARKLE_CFLAGS=
+WINSPARKLE_LIBS=
!ENDIF
!IFDEF ENABLE_LIBWIRESHARK
-LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1
# Link plugins with the import library of libwireshark.dll
LINK_PLUGINS_WITH_LIBWIRESHARK=USE
!ELSE
# Construct the path
PATH=$(PATH);$(CYGWIN_PATH);$(GTK_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 / metze / wireshark / wip.git / blobdiff