diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-02-14 17:16:12 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-02-14 17:16:12 +0000 |
| commit | 718b14c7ce8dceb7faa6a6c22dbe197f6dabfbb9 (patch) | |
| tree | 87bcc9cbb938b9ecdacb038c74ab2a9dbd66e428 | |
| parent | ba11df88da796bec3b3e7413a88ba8ab18a25696 (diff) | |
| download | wireshark-718b14c7ce8dceb7faa6a6c22dbe197f6dabfbb9.tar.gz | |
Glib >= 2.14.5 does not require iconv
svn path=/trunk/; revision=24330
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | config.nmake | 10 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 2 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 04fc7447eb..4b414e3815 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -662,8 +662,10 @@ process_libs: @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk+ gtk+-dev-1.3.0-20030115.zip !ENDIF +!IFDEF ICONV_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip +!ENDIF @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gettext-runtime-0.17-1 gettext-runtime-0.17-1.zip !IFDEF KFW_DIR @@ -1030,7 +1032,9 @@ install-common-deps: xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d +!IFDEF ICONV_DIR xcopy $(ICONV_DIR)\bin\iconv.dll $(INSTALL_DIR) /d +!ENDIF xcopy $(GETTEXT_DIR)\bin\intl.dll $(INSTALL_DIR) /d !IFDEF ZLIB_DIR xcopy $(ZLIB_DIR)\zlib1.dll $(INSTALL_DIR) /d diff --git a/config.nmake b/config.nmake index 1acb326fd3..0175abe3b9 100644 --- a/config.nmake +++ b/config.nmake @@ -272,12 +272,12 @@ PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19 PORTAUDIO_VERSION=19 # -# Mandatory for GTK >= 2: Iconv -# +# Iconv: Mandatory for Glib >= 2 and <= 2.14.4 +# [win-iconv statically linked for Glib >= 2.14.5] # Set ICONV_DIR to the directory in which the # ICONV include files and library resides. # -ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32 +##ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32 # # Mandatory for GTK >= 2: Gettext @@ -866,4 +866,8 @@ 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 diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index e875457666..1698be2b32 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -37,7 +37,9 @@ libwireshark_LIBS = \ $(LUA_LIBS) \ $(SMI_LIBS) \ ..\wiretap\wiretap-$(WTAP_VERSION).lib \ +!IFDEF ICONV_DIR $(ICONV_DIR)\lib\iconv.lib \ +!ENDIF crypt\airpdcap.lib \ ftypes\ftypes.lib \ dfilter\dfilter.lib \ diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 33ca9cdc05..e42f616701 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -150,7 +150,9 @@ $(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nm /DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \ !ENDIF /DGLIB_DIR=$(GLIB_DIR) \ +!IFDEF ICONV_DIR /DICONV_DIR=$(ICONV_DIR) \ +!ENDIF /DGETTEXT_DIR=$(GETTEXT_DIR) \ /DVERSION=$(VERSION) \ /DWTAP_VERSION=$(WTAP_VERSION) \ |