diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-09-13 16:48:13 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-09-13 16:48:13 +0000 |
| commit | 4b315db979b398fbef7a775e213c0081c8aa1a95 (patch) | |
| tree | 42a31a00554722eae4019bfafb1f8a9e7f3eab90 /config.nmake | |
| parent | 31bcfa732db9732467037f8641e187ad334f9575 (diff) | |
From Peter Johansson
PATH contents one had before starting the build, that PATH is added to the new PATH variable 5 additional times
instead of 1.
I have made changes (supplied) to config.nmake that takes care of this
problem.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15782 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake index fa1393fbb7..eb5c720bf6 100644 --- a/config.nmake +++ b/config.nmake @@ -156,11 +156,11 @@ LOCAL_LDFLAGS=/DEBUG # Set PDB_FILE according to your VC++ version PDB_FILE=vc*.pdb -# add cygwin binaries to the path -PATH=$(PATH);c:\cygwin\bin +# Set up the path to the cygwin binaries +CYGWIN_PATH=c:\cygwin\bin -# add some required DLLs to the path -PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(PATH) +# Set up the path to some required DLLs +DLL_PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin # Set the following commands to find the tools. @@ -299,7 +299,7 @@ WPCAP_CONSTIFIED= !ENDIF !IFDEF ZLIB_DIR -PATH=$(ZLIB_DIR);$(PATH) +ZLIB_PATH=$(ZLIB_DIR) ZLIB_CFLAGS=/I$(ZLIB_DIR)\include ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib # Nmake uses carets to escape special characters @@ -311,7 +311,7 @@ ZLIB_CONFIG= !ENDIF !IFDEF ADNS_DIR -PATH=$(ADNS_DIR)\adns_win32\lib;$(PATH) +ADNS_PATH=$(ADNS_DIR)\adns_win32\lib ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 ADNS_LIBS=$(ADNS_DIR)\adns_win32\lib\adns_dll.lib # Nmake uses carets to escape special characters @@ -323,7 +323,7 @@ ADNS_CONFIG= !ENDIF !IFDEF PCRE_DIR -PATH=$(PCRE_DIR)\bin;$(PATH) +PCRE_PATH=$(PCRE_DIR)\bin PCRE_CFLAGS=/I$(PCRE_DIR)\include PCRE_LIBS=$(PCRE_DIR)\lib\pcre.lib # Nmake uses carets to escape special characters @@ -350,3 +350,6 @@ LIBETHEREAL_CONFIG=^#define HAVE_LIBETHEREALDLL 1 !ELSE LIBETHEREAL_CONFIG= !ENDIF + +# Construct the path +PATH=$(CYGWIN_PATH);$(DLL_PATH);$(ZLIB_PATH);$(ADNS_PATH);$(PATH)
\ No newline at end of file |