diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-01-30 10:54:12 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-30 19:23:28 +0000 |
| commit | f61c969f0ca7f7ab33b0210879e773e83a5da9eb (patch) | |
| tree | edf0ed4ce556247b0fa828985690cbe690db6a5a /config.nmake | |
| parent | eda485ea53c7ac77470f47e886b6513f28f0c20b (diff) | |
| download | wireshark-f61c969f0ca7f7ab33b0210879e773e83a5da9eb.tar.gz | |
NMake: Add Chocolatey paths.
Change-Id: I8ea53475a64052e945709a1f5878aa23eee65c74
Reviewed-on: https://code.wireshark.org/review/6859
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index 942499ef28..74bbdf3320 100644 --- a/config.nmake +++ b/config.nmake @@ -209,7 +209,10 @@ NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe # Find native Python automatically if PYTHON(_DIR) wasn't defined !IF !DEFINED(PYTHON) && !DEFINED(PYTHON_DIR) -!IF EXIST(c:\Python27\python.exe) +!IF EXIST(c:\tools\python2\python.exe) +# Chocolatey default +PYTHON_DIR=C:\tools\python2 +!ELSE IF EXIST(c:\Python27\python.exe) PYTHON_VER=27 !ELSE IF EXIST(c:\Python26\python.exe) PYTHON_VER=26 @@ -782,6 +785,9 @@ GTK_SCHEMAS_DIR=\share\glib-2.0\schemas CYGWIN_PATH=C:\cygwin\bin !ELSE IF EXIST(C:\cygwin64\bin) CYGWIN_PATH=C:\cygwin64\bin +!ELSE IF EXIST(C:\tools\cygwin\bin) +# Chocolatey default +CYGWIN_PATH=C:\tools\cygwin\bin !ELSE !ERROR Could not locate Cygwin, please set CYGWIN_PATH explicitly in config.nmake !ENDIF |