diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-01-16 18:57:29 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-01-16 18:57:29 +0000 |
commit | 8db4bc2499a43afe57fca8589a43d7ee30cd1b86 (patch) | |
tree | b36159df3b1ce08563d637538a6d39e9d936aa4e /config.nmake | |
parent | 62249477b6b159e929ac4f94bf5e3c38c475636d (diff) |
More Chocolatey lex/yacc updates.
Add Windows-style path handling to runlex.sh. Update the example
Chocolatey LEX path accordingly. This lets us use path information in
LEX and have it work in both nmake and runlex.sh
Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it.
The code is currently untested and commented out.
svn path=/trunk/; revision=54828
Diffstat (limited to 'config.nmake')
-rw-r--r-- | config.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index ee160c781a..46bc9c57ef 100644 --- a/config.nmake +++ b/config.nmake @@ -790,7 +790,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 +798,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 |