Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back...

[metze/wireshark/wip.git] / config.nmake

diff --git a/config.nmake b/config.nmake
index ee160c781a946f9e5b7132d68ac9f42073e50cd2..156c8de38000a558f684e2240612cb046c5827be 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -100,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
@@ -790,7 +776,7 @@ SED=sed
 
 # Command for lex/flexx. Cygwin's flex or Chocolatey's win_flex
 # recommended.
-# This is called by tools\runlex.sh and must be a UNIX-style path
+# 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
@@ -798,12 +784,12 @@ SED=sed
 # directly should work.
 
 #LEX=win_flex
-#LEX=/cygdrive/c/Chocolatey/lib/winflexbison.2.4.1.20140103/tools/win_flex
+#LEX=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_flex
 LEX=flex
 
 # Command for yacc/bison. Cygwin's bison or Chocolatey's win_bison
 # recommended.
-# This is called by nmake and must be a Windows-style path
+# Absolute or relative paths must be Windows-style
 
 #YACC=win_bison
 #YACC=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_bison