Turn around the sequence of PATH, so the former PATH will be in front of the newly added things.
This way, the cygwin link.exe command will be behind the link.exe from MSVC. Also added a definition of the docbook dir, floating around in my personal file for a while. This will be needed if the User's Guide is included in the NSIS installer later. svn path=/trunk/; revision=15790
This commit is contained in:
parent
a242f1926b
commit
2b82bb3df7
11
config.nmake
11
config.nmake
|
@ -33,6 +33,15 @@ RC_WTAP_VERSION=0,3
|
|||
#
|
||||
WINPCAP_VERSION=3.0
|
||||
|
||||
#
|
||||
# Directory, where your User's Guide reside, relative to the source dir.
|
||||
# (currently unused)
|
||||
#
|
||||
# If you don't have the User's Guide, comment this line out, so that
|
||||
# ETHEREAL_EUG_DIR isn't defined.
|
||||
#
|
||||
#ETHEREAL_EUG_DIR=docbook/eug_html_chunked
|
||||
|
||||
#
|
||||
# Base directory, where your libraries reside, which needs to be
|
||||
# compiling the sources. This is only inside this file.
|
||||
|
@ -352,4 +361,4 @@ LIBETHEREAL_CONFIG=
|
|||
!ENDIF
|
||||
|
||||
# Construct the path
|
||||
PATH=$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH);$(PATH)
|
||||
PATH=$(PATH);$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH)
|
Loading…
Reference in New Issue