summaryrefslogtreecommitdiff
path: root/config.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-01-16 01:28:02 +0000
committerGerald Combs <gerald@wireshark.org>2014-01-16 01:28:02 +0000
commitd5b706be513769a6f44fffb23b4d87b9c45f3c05 (patch)
tree4673c13165361921718c02c1a0cdc92f83895fb7 /config.nmake
parent60045cae1cf352861deaf86d581c1e44ad27b128 (diff)
downloadwireshark-d5b706be513769a6f44fffb23b4d87b9c45f3c05.tar.gz
Allow the use of Win flex-bison and document how to do that.
svn path=/trunk/; revision=54824
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake20
1 files changed, 15 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake
index aa2097ae1c..ee160c781a 100644
--- a/config.nmake
+++ b/config.nmake
@@ -788,15 +788,25 @@ POD2HTML=$(SH) pod2html
# command for sed (cygwin's sed recommended)
SED=sed
-# command for lex/flexx. Cygwin's flex recommended. Chocolatey has a
-# "Win flex-bison" package but it is currently unusable without some
-# manual adjustments to the win_flex and win_bison wrapper scripts.
-# This is called by tools/runlex.sh and must be a UNIX-style path
+# 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
+
+# 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=/cygdrive/c/Chocolatey/lib/winflexbison.2.4.1.20140103/tools/win_flex
LEX=flex
-# command for yacc/bison (Cygwin's bison recommended, see flex comments above)
+# 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
+
#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