diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-26 06:54:48 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-26 06:54:48 +0000 |
| commit | 0dead996a26d4f714a824b868642c27a8b558cd7 (patch) | |
| tree | 13a1b38cf43ae6ef4f792faaca6513d810a4a282 /config.nmake | |
| parent | 57ec611fa19e81e53655c828adb6f86d8862eaa0 (diff) | |
win-iconv is statically linked as part of Glib >= 2.14.5, so remove it from config.nmake
svn path=/trunk/; revision=29559
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/config.nmake b/config.nmake index b95f21ab16..0e03725d6c 100644 --- a/config.nmake +++ b/config.nmake @@ -310,14 +310,6 @@ PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2 PORTAUDIO_VERSION=19 # -# Iconv: Mandatory for Glib >= 2 and <= 2.14.4 -# [win-iconv statically linked as part of 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 - -# # Mandatory for GTK >= 2: Gettext # # Set GETTEXT_DIR to the directory in which the @@ -538,14 +530,6 @@ PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2 PORTAUDIO_VERSION=19 # -# Iconv: Mandatory for Glib >= 2 and <= 2.14.4 -# [win-iconv statically linked as part of 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 - -# # Mandatory for GTK >= 2: Gettext # # Set GETTEXT_DIR to the directory in which the |