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 /Makefile.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 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 161b626f0c..b3ab32cef4 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -746,10 +746,6 @@ process_libs: !ELSE !ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF -!IFDEF ICONV_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip -!ENDIF !IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32" @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gettext-runtime-0.17-1 gettext-runtime-0.17-1.zip @@ -1045,9 +1041,6 @@ install-all: install-generated-files xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d xcopy $(GLIB_DIR)\bin\libgthread-2.0-0.dll $(INSTALL_DIR) /d -!IFDEF ICONV_DIR - xcopy $(ICONV_DIR)\bin\iconv.dll $(INSTALL_DIR) /d -!ENDIF xcopy $(GETTEXT_DIR)\bin\$(GETTEXT_DLL) $(INSTALL_DIR) /d !IFDEF ZLIB_DIR xcopy $(ZLIB_DLL) $(INSTALL_DIR) /d |