osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix the checks for the Cygwin path. 

I.e., do

	if we have 32-bit Cygwin
		CYGWIN_PATH=path to it
	else if we have 64-bit Cygwin
		CYGWIN_PATH=path to it
	else
		fail
	endif

rather than

	CYGWIN_PATH=standard path for 32-bit Cygwin
	if we don't have 32-bit cygwin and we do have 64-bit Cygwin
		CYGWIN_PATH=path to 64-bit cygwin
	else
		fail
	endif

as the latter will fail if we *do* have 32-bit Cygwin.

Change-Id: I42d607a1319263edcc1d6e546b813862b7d33ffa
Reviewed-on: https://code.wireshark.org/review/2756
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-07-01 13:18:06 -07:00
parent aa0f80981a
commit e696d0f93d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config.nmake
View File

@ -755,13 +755,14 @@ GTK_SCHEMAS_DIR=\share\glib-2.0\schemas
##### Tools #####
# Set the following mandatory commands to find the tools.
# The easiest way is to use the corresponding packages from cygwin.
# The easiest way is to use the corresponding packages from Cygwin.
# 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)
# Set up the path to the Cygwin binaries
# First check whether a 32-bit Cygwin installation exists
# If not, check for a 64-bit Cygwin installation
!IF EXIST(C:\cygwin\bin)
CYGWIN_PATH=C:\cygwin\bin
!ELSE IF EXIST(C:\cygwin64\bin)
CYGWIN_PATH=C:\cygwin64\bin
!ELSE
!ERROR Could not locate Cygwin, please set CYGWIN_PATH explicitly in config.nmake