diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-27 05:04:29 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-27 05:04:29 +0000 |
commit | 5417edcfdc2476f9df5344d2d0c6952314553811 (patch) | |
tree | d6c8e3d82e1090cd1b3a70b8d29feea404989b0e /config.nmake | |
parent | fb37e926f6d64c0e0a93c0343f29a1879e5533bf (diff) | |
download | wireshark-5417edcfdc2476f9df5344d2d0c6952314553811.tar.gz |
Windows: remove all references to ICONV_DIR, because we use the statically linked win-iconv instead
svn path=/trunk/; revision=29580
Diffstat (limited to 'config.nmake')
-rw-r--r-- | config.nmake | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index f2fd31bf4d..90c8d2e150 100644 --- a/config.nmake +++ b/config.nmake @@ -1176,11 +1176,7 @@ LIBWIRESHARK_CONFIG= !ENDIF # Construct the path -!IFDEF ICONV_DIR -PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH) -!ELSE PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH) -!ENDIF # We can't use a lot of IPv6 code with plain Visual C++ 6.0 !IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK) |