# the file README.windows and the Developer's Guide (available online).
##### Program name #####
-# Do not change as it will break the installer and possibly other stuff
-PROGRAM_NAME=wireshark
+# 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).
# The current Wireshark version. Recommended: Leave unchanged.
# Updated by make-version.pl
VERSION_MAJOR=1
-VERSION_MINOR=9
+VERSION_MINOR=11
VERSION_MICRO=0
VERSION_BUILD=$(SVN_REVISION)
# "Microsoft Visual C++ 2012 Express Edition"
# Visual C++ 11.0, _MSC_VER 1700, msvcr110.dll
-## Note: 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*
+## 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
+## *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"
# 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 - experimental
-GTK_NAME=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.
#EXPAT_DLL=libexpat-1.dll
FFI_DLL=libffi-5.dll
!IF "$(GTK_NAME)" == "gtk2"
GDK_DLL=libgdk-win32-2.0-0.dll
GTK_DLL=libgtk-win32-2.0-0.dll
-#GTK_PKG=2.16.6-20100912
-#GTK_PKG=2.22.1-20101227
-GTK_PKG=2.24.10-2.7
+#GTK_PKG=2.24.10-2.7
+GTK_PKG=2.24.14-1.1
PKG_SUFIX=ws
!ELSE
GDK_DLL=libgdk-3-0.dll
# 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
#
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.
#
# 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
+#
+# Used for automatic software updates
+#
+WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws
!else
##### Win64 Libraries #####
# directory in which the "include" and "lib" directories reside.
#
#
-# Set the name to gtk3 if you want to use gtk3 - experimental
+# Set the name to gtk3 if you want to use gtk3 - (experimental ?)
GTK_NAME=gtk2
GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
!IF "$(GTK_NAME)" == "gtk2"
GDK_DLL=libgdk-win32-2.0-0.dll
GTK_DLL=libgtk-win32-2.0-0.dll
-#GTK_PKG=2.16.6-20100912
-GTK_PKG=2.24.10-2.7
+#GTK_PKG=2.24.10-2.7
+GTK_PKG=2.24.14-1.1
PKG_SUFIX=ws
!ELSE
GDK_DLL=libgdk-3-0.dll
#
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.
#
# 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
+#
+# 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 #####
# 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)
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.
# /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
"$(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
# 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
!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
##############################################################################
#
/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 \
NEED_TIFF_DLL=USE
NEED_LZMA_DLL=USE
-GTK_WIMP_DLLSRC_DIR=$(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines
-GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\$(GTK_LIB_DIR)\engines
-GTK_WIMP_RCSRC_DIR=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0
-GTK_WIMP_RCDST_DIR=etc\gtk-2.0
-#
-# Use of GTK3+ is experimental/not working
-#
!ELSEIF "$(GTK_INST_VERSION)" == "3.4"
-GTK_SCHEMAS_INST_DIR=\share\glib-2.0\schemas
# GTK+
GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-3.0 \
/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 \
!IFDEF _DLL
!ENDIF
+NEED_CAIRO_GOBJECT_DLL=USE
NEED_CAIRO_DLL=USE
!IFDEF EXPAT_DLL
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
+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
git.samba.org / metze / wireshark / wip.git / blobdiff