diff options
| -rw-r--r-- | Makefile.nmake | 7 | ||||
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 3 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 3 |
4 files changed, 0 insertions, 17 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 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) diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 17b1432ec9..7c677ffcf4 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -43,9 +43,6 @@ libwireshark_LIBS = \ $(GEOIP_LIBS) \ ..\wsutil\libwsutil.lib \ ..\wiretap\wiretap-$(WTAP_VERSION).lib \ -!IFDEF ICONV_DIR - $(ICONV_DIR)\lib\iconv.lib \ -!ENDIF crc\crc.lib \ crypt\airpdcap.lib \ ftypes\ftypes.lib \ diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 9ed15363fc..5fb9ee1377 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -117,9 +117,6 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $( /DGTK_WIMP_RCDST_DIR=$(GTK_WIMP_RCDST_DIR) \ /DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \ /DGLIB_DIR=$(GLIB_DIR) \ -!IFDEF ICONV_DIR - /DICONV_DIR=$(ICONV_DIR) \ -!ENDIF /DGETTEXT_DIR=$(GETTEXT_DIR) \ /DGETTEXT_DLL=$(GETTEXT_DLL) \ /DVERSION=$(VERSION) \ |