Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back...
[metze/wireshark/wip.git] / config.nmake
index 4829654d2653150ab541e0adeca2f9fbf605017f..156c8de38000a558f684e2240612cb046c5827be 100644 (file)
@@ -42,6 +42,11 @@ WTAP_VERSION_MAJOR=$(VERSION_MAJOR)
 WTAP_VERSION_MINOR=$(VERSION_MINOR)
 WTAP_VERSION_MICRO=0
 
+# The version of the filetap library. Recommended: Leave unchanged.
+FTAP_VERSION_MAJOR=$(VERSION_MAJOR)
+FTAP_VERSION_MINOR=$(VERSION_MINOR)
+FTAP_VERSION_MICRO=0
+
 ##### Directories #####
 
 #
@@ -95,20 +100,6 @@ PROCESSOR_ARCHITECTURE=amd64
 # For the different Studios, see: http://en.wikipedia.org/wiki/Microsoft_Visual_Studio
 # Only one of the following MSVC_VARIANT settings should be used
 
-# "Microsoft Visual Studio 2005"
-# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
-#MSVC_VARIANT=MSVC2005
-
-# "Microsoft Visual C++ 2005 Express Edition"
-# needs additional Platform SDK installation
-# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
-#MSVC_VARIANT=MSVC2005EE
-
-# "Microsoft .Net Framework 2.0 SDK"
-# needs additional Platform SDK installation
-# Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll
-#MSVC_VARIANT=DOTNET20
-
 # "Microsoft Visual Studio 2008"
 # Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll
 #MSVC_VARIANT=MSVC2008
@@ -783,10 +774,25 @@ POD2HTML=$(SH) pod2html
 # command for sed (cygwin's sed recommended)
 SED=sed
 
-# command for lex/flexx (cygwin's flex recommended)
+# Command for lex/flexx. Cygwin's flex or Chocolatey's win_flex
+# recommended.
+# Absolute or relative paths must be Windows-style
+
+# Chocolatey's C:\Chocolatey\bin\win_flex and -\win_bison are
+# currently unusable without some manual adjustments to the
+# win_flex and win_bison wrapper scripts. Calling the executables
+# directly should work.
+
+#LEX=win_flex
+#LEX=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_flex
 LEX=flex
 
-# command for yacc/bison (cygwin's bison recommended)
+# Command for yacc/bison. Cygwin's bison or Chocolatey's win_bison
+# recommended.
+# Absolute or relative paths must be Windows-style
+
+#YACC=win_bison
+#YACC=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_bison
 YACC=bison
 
 # Commands to convert UNIX line endings to DOS/Windows
@@ -1281,6 +1287,8 @@ PRODUCT_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).$(VERSION_BUI
 
 WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO)
 RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)
+FTAP_VERSION=$(FTAP_VERSION_MAJOR).$(FTAP_VERSION_MINOR).$(FTAP_VERSION_MICRO)
+RC_FTAP_VERSION=$(FTAP_VERSION_MAJOR),$(FTAP_VERSION_MINOR),$(FTAP_VERSION_MICRO)
 
 # GLib
 GLIB_CFLAGS=/I$(GTK_DIR)\include\glib-$(GLIB_VERSION) \
@@ -1343,6 +1351,12 @@ NEED_LZMA_DLL=USE
 !ELSEIF "$(GTK_INST_VERSION)" == "3.4"
 
 # GTK+
+## Note: If Wireshark is ever to be built with Gtk >= 3.10
+##        then -DGTK_DISABLE_DEPRECATED must be removed
+##        and -DGDK_DISABLE_DEPRECIATION_WARNINGS must
+##        be added below.
+##       Wireshark changes to handle Gtk 3.10 deprecated features
+##        will not be done since Wireshark is moving to Qt.
 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 \