From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9375 :
[metze/wireshark/wip.git] / config.nmake
index 667956856684aa0d56f8db9b7e1f32c3ddd13b0a..8b33ebe41621e8139709cf16d914e91159f15e40 100644 (file)
@@ -3,6 +3,16 @@
 # 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.
@@ -18,7 +28,7 @@ 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=1
 VERSION_BUILD=$(SVN_REVISION)
 
@@ -40,7 +50,7 @@ WTAP_VERSION_MICRO=0
 # 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
 
 #
@@ -48,6 +58,7 @@ WIRESHARK_LIB_DIR=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
 # 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
@@ -110,10 +121,43 @@ PROCESSOR_ARCHITECTURE=amd64
 # 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
+
+# "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.
+# 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
 
 #
@@ -215,16 +259,38 @@ GLIB_VERSION=2.0
 # 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.
@@ -232,11 +298,38 @@ GTK_PKG=2.22.1-20101227
 # (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.
+# 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.
@@ -246,7 +339,8 @@ GTK_INST_VERSION=2.22
 #
 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
@@ -294,18 +388,18 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
 # 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.
@@ -383,7 +477,14 @@ SMI_PKG=svn-40773
 #
 # Used to map IP addresses to MaxMind GeoIP database entries
 #
-GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win32ws\libGeoIP
+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 #####
@@ -402,19 +503,38 @@ GLIB_VERSION=2.0
 # 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.
@@ -422,11 +542,39 @@ GTK_PKG=2.22.1-20101229
 # (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.
+# 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.
@@ -436,7 +584,8 @@ GTK_INST_VERSION=2.22
 #
 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
@@ -484,18 +633,18 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
 # 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.
@@ -528,7 +677,7 @@ GNUTLS_PKG=2.10.3-1.7
 # 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
 
 #
@@ -573,9 +722,28 @@ SMI_PKG=svn-40773
 #
 # 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 #####
 
@@ -608,6 +776,9 @@ PERL=perl
 POD2MAN=$(SH) pod2man
 POD2HTML=$(SH) pod2html
 
+# command for sed (cygwin's sed recommended)
+SED=sed
+
 # command for lex/flexx (cygwin's flex recommended)
 LEX=flex
 
@@ -619,14 +790,25 @@ UNIX2DOS=u2d
 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.
@@ -661,7 +843,7 @@ MAKENSIS_UNICODE="$(PROGRAM_FILES)\NSIS\Unicode\makensis.exe"
 # 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)
@@ -691,6 +873,10 @@ MSC_VER_REQUIRED=1400
 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
+!ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" ||  "$(MSVC_VARIANT)" == "MSVC2013EE"
+MSC_VER_REQUIRED=1800
 !ELSE
 !ERROR MSVC_VARIANT unknown
 !ENDIF
@@ -701,6 +887,17 @@ MSC_VER_REQUIRED=1600
 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.
@@ -709,6 +906,7 @@ MANIFEST_INFO_REQUIRED=1
 #                                     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
@@ -720,6 +918,16 @@ MANIFEST_INFO_REQUIRED=1
 # /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
 #
 ##Note: LOCAL_CFLAGS are flags used for *all* compilations
 ##      STANDARD_CFLAGS (see below) are flags used just for *Wireshark* compilations
@@ -729,9 +937,18 @@ MANIFEST_INFO_REQUIRED=1
         "$(MSVC_VARIANT)" == "MSVC2008"   || \
         "$(MSVC_VARIANT)" == "MSVC2008EE" || \
         "$(MSVC_VARIANT)" == "MSVC2010"   || \
-        "$(MSVC_VARIANT)" == "MSVC2010EE"
+        "$(MSVC_VARIANT)" == "MSVC2010EE" || \
+        "$(MSVC_VARIANT)" == "MSVC2012"   || \
+        "$(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)" == "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
@@ -762,7 +979,11 @@ WARNINGS_CFLAGS=/w34295
 !IF     "$(MSVC_VARIANT)" == "MSVC2008"   || \
         "$(MSVC_VARIANT)" == "MSVC2008EE" || \
         "$(MSVC_VARIANT)" == "MSVC2010"   || \
-        "$(MSVC_VARIANT)" == "MSVC2010EE"
+        "$(MSVC_VARIANT)" == "MSVC2010EE" || \
+        "$(MSVC_VARIANT)" == "MSVC2012"   || \
+        "$(MSVC_VARIANT)" == "MSVC2012EE" || \
+        "$(MSVC_VARIANT)" == "MSVC2013"   || \
+        "$(MSVC_VARIANT)" == "MSVC2013EE"
 LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP
 !ENDIF
 
@@ -774,7 +995,7 @@ 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_="" /DPCAP_VERSION=$(PCAP_VERSION) $(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
@@ -846,37 +1067,131 @@ INSTALL_DIR=wireshark-gtk2
 # packages, the following will use the default paths depending
 # on the package version.
 #
+
+# 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
+
 !IF "$(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
+#
+# 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" || "$(MSVC_VARIANT)" == "MSVC2012EE"
+#
+# EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227
+#
+# 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
+# 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\*.*
+!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
 
-!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
@@ -926,7 +1241,11 @@ XSLTPROC="xsltproc"
 # 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
 
 ##############################################################################
 #
@@ -962,12 +1281,17 @@ RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO
 # 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 \
@@ -975,8 +1299,10 @@ GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-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 \
@@ -986,31 +1312,95 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-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.24" || "$(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
 
-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
+!ELSEIF "$(GTK_INST_VERSION)" == "3.4"
+
+# 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
 
 
@@ -1019,6 +1409,7 @@ AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1
 #AIRPCAP_CFLAGS=/I$(AIRPCAP_DIR)\include
 !ELSE
 AIRPCAP_CONFIG=
+WIRELESS_TOOLBAR_CONFIG=
 !ENDIF
 
 !IFDEF PCAP_DIR
@@ -1157,7 +1548,7 @@ LUA_CFLAGS=/I$(LUA_DIR)\include
 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=
@@ -1210,20 +1601,33 @@ SMI_CFLAGS=
 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_V6_CONFIG=^#define HAVE_GEOIP_V6 1
-GEOIP_CFLAGS=/I$(GEOIP_DIR)
-GEOIP_LIBS=$(GEOIP_DIR)\GeoIP.lib
+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
+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