diff options
| author | Tim Furlong <tim.furlong@gmail.com> | 2014-06-30 22:54:46 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-07-01 19:18:29 +0000 |
| commit | 2211813e2190007b42e4385e06c5d10959f74e75 (patch) | |
| tree | f598f0967237e6c9bdf913f91145f0b8f71233f3 /config.nmake | |
| parent | e1e7dd0cfd505ac22a1f9ef8b42957c3d88df5fe (diff) | |
| download | wireshark-2211813e2190007b42e4385e06c5d10959f74e75.tar.gz | |
Add logic to config.nmake to find 64-bit cygwin, and a note warning
about forward slashes in the QT5_BASE_PATH if the recommended qmake
command is used; both of these issues will cause annoyingly non-
obvious errors.
Change-Id: I6f9a662969d1fc1887e75e8b0fde3520bbbea416
Reviewed-on: https://code.wireshark.org/review/2749
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index 9d8d45b88e..90695fee57 100644 --- a/config.nmake +++ b/config.nmake @@ -317,6 +317,8 @@ GTK_INST_VERSION=3.4 # installation directory: # http://stackoverflow.com/questions/913642/qmake-and-qt-install-prefix-how-can-i-select-a-new-location-for-qt-library # +# NOTE> the qmake command given below returns a path with forward slashes, +# which will need to be changed to backslashes for things to work properly #QT5_BASE_DIR=output of "qmake -query QT_INSTALL_PREFIX" !IF !DEFINED(QT5_BASE_DIR) # Wireshark custom @@ -758,6 +760,13 @@ GTK_SCHEMAS_DIR=\share\glib-2.0\schemas # Set up the path to the cygwin binaries CYGWIN_PATH=c:\cygwin\bin +# If that doesn't exist, check for a 64-bit cygwin installation +!IF !EXIST($(CYGWIN_PATH)) && EXIST(C:\cygwin64\bin) +CYGWIN_PATH=C:\cygwin64\bin +!ELSE +!ERROR Could not locate Cygwin, please set CYGWIN_PATH explicitly in config.nmake +!ENDIF + # command for a shell (cygwin's bash package recommended) SH_PROG=bash |