#
NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe
-#
-# Optional: the Python library enables scripting support.
-#
-# If you don't have the Python library, comment this line out, so that
-# PYTHON_EMBED isn't defined.
-#
-# NOTE: The Python library must have been compiled with the same
-# compiler (MSVC_VARIANT) as Wireshark. Known python.org Python
-# CRT versions:
-#
-# Python version CRT (32-bit) CRT (64-bit)
-# 2.4.4 7.1 ?
-# 2.6.1 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.
-#
-# XXX The DLL path in epan/wspython/wspy_libws.py likely needs to
-# be fixed before this is enabled by default.
-#PYTHON_EMBED=1
-
#
# Optional: the Python interpreter is used as part of the buildsystem
#
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.12.18-1.2
+GNUTLS_PKG=3.1.22-2.3
+GPGERROR_DLL=libgpg-error-0.dll
+GCC_DLL=libgcc_s_sjlj-1.dll
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
#
KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6
-#
-# Optional: the Nettle library enables ??? decryption.
-#
-# If you have the Nettle encryption library, set this to the
-# directory in which the nettle package is stored.
-#
-# If you don't have Nettle, comment this line out, so that NETTLE_DIR
-# isn't defined.
-#
-# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10
-
-#
# Optional: the LUA library enables scripting support.
#
# If you have the LUA library, set this to the directory in which
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=2.12.18-1.2-1
+GNUTLS_PKG=3.1.22-2.3
+GPGERROR_DLL=libgpg-error6-0.dll
+GCC_DLL=libgcc_s_seh-1.dll
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
#
#KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3.2.2-ws1
-#
-# Optional: the Nettle library enables ??? decryption.
-#
-# If you have the Nettle encryption library, set this to the
-# directory in which the nettle package is stored.
-#
-# If you don't have Nettle, comment this line out, so that NETTLE_DIR
-# isn't defined.
-#
-# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10
-
#
# Optional: the LUA library enables scripting support.
#
##### Flags, PATHs and Miscellaneous #####
-# 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
-
# "convert" the MSVC variant into the required MSC compiler version
!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
MSC_VER_REQUIRED=1400
# This definition prevents the complaint about the redefinition of inline by WinPCap
# in pcap-stdinc.h when compiling CPP files, e.g. the QT UI
#
-# -Ox http://msdn.microsoft.com/en-us/library/59a3b321.aspx
-# Specifying the /Ox compiler option is the same as using the following options:
+# -O2 http://msdn.microsoft.com/en-us/library/8f8h5cxt.aspx
+# Specifying the /O2 compiler option is the same as using the following options:
# /Ob (Inline Function Expansion), where the option parameter is 2 (/Ob2)
# /Og (Global Optimizations)
# /Oi (Generate Intrinsic Functions)
# /Ot (Favor Fast Code)
# /Oy (Frame-Pointer Omission)
+# /Gs (Buffer Security Check)
+# /GF (Eliminate Duplicate Strings)
+# /Gy (Enable Function-Level Linking)
##Note: LOCAL_CFLAGS are flags used for *all* compilations
## STANDARD_CFLAGS (see below) are flags used just for *Wireshark* compilations
"$(MSVC_VARIANT)" == "MSVC2012EE" || \
"$(MSVC_VARIANT)" == "MSVC2013" || \
"$(MSVC_VARIANT)" == "MSVC2013EE"
-LOCAL_CFLAGS=/Zi /W3 /MD /Ox /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \
+LOCAL_CFLAGS=/Zi /W3 /MD /O2 /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \
/D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE -DPSAPI_VERSION=1
!IF "$(MSVC_VARIANT)" == "MSVC2012" || \
#
# install (debug) directory for Wireshark (relative to your source dir)
INSTALL_DIR=wireshark-gtk2
+INSTALL_DIR_QT=wireshark-qt-release
-
+#
+# Lacking a better way, define the Qt version used here
+QT_VERSION=5.2
##### C-Runtime Redistributable #####
#
KFW_CONFIG=
!ENDIF
-!IFDEF NETTLE_DIR
-NETTLE_CFLAGS=/I$(NETTLE_DIR)
-NETTLE_LIBS=$(NETTLE_DIR)\libnettle.lib
-# Nmake uses carets to escape special characters
-NETTLE_CONFIG=^#define HAVE_LIBNETTLE 1
-!else
-NETTLE_CFLAGS=
-NETTLE_LIBS=
-NETTLE_CONFIG=
-!ENDIF
-
!IFDEF GNUTLS_PKG
GNUTLS_DIR=$(WIRESHARK_LIB_DIR)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
GNUTLS_PATH=$(GNUTLS_DIR)
# /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash
GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL
-GCRYPT_LIBS = $(GNUTLS_DIR)\bin\libgcrypt-11.lib
+GCRYPT_LIBS = $(GNUTLS_DIR)\bin\libgcrypt-20.lib
GNUTLS_LIBS=\
- $(GNUTLS_DIR)\bin\libtasn1-3.lib \
+ $(GNUTLS_DIR)\bin\libtasn1-6.lib \
+!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
$(GNUTLS_DIR)\bin\libgpg-error-0.lib \
+!ELSE
+ $(GNUTLS_DIR)\bin\libgpg-error6-0.lib \
+!ENDIF
$(GCRYPT_LIBS) \
- $(GNUTLS_DIR)\bin\libgnutls-26.lib
+ $(GNUTLS_DIR)\bin\libgnutls-28.lib
# Nmake uses carets to escape special characters
GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1
LIBGCRYPT_CONFIG=^#define HAVE_LIBGCRYPT 1
LUA_CONFIG=
!ENDIF
-!IF DEFINED(PYTHON_EMBED)
-PYTHON_CFLAGS=/I$(PYTHON_DIR)\include
-PYTHON_LIBS=$(PYTHON_DIR)\libs\python$(PYTHON_VER).lib
-# Nmake uses carets to escape special characters
-PYTHON_CONFIG=^#define HAVE_PYTHON 1
-!else
-PYTHON_CFLAGS=
-PYTHON_LIBS=
-PYTHON_CONFIG=
-!ENDIF
-
!IFDEF PORTAUDIO_DIR
# Nmake uses carets to escape special characters
PORTAUDIO_CONFIG=^#define HAVE_LIBPORTAUDIO 1