diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-26 07:05:50 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-26 07:05:50 +0000 |
| commit | 10ce541917bfac9ef975691657bdece5550a3720 (patch) | |
| tree | 36321eb6089f17c7abd6173807bc2caf601c0efe /config.nmake | |
| parent | 0dead996a26d4f714a824b868642c27a8b558cd7 (diff) | |
| download | wireshark-10ce541917bfac9ef975691657bdece5550a3720.tar.gz | |
Reorder so that mandatory requirements appear in succession
svn path=/trunk/; revision=29560
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/config.nmake b/config.nmake index 0e03725d6c..74b8134f3e 100644 --- a/config.nmake +++ b/config.nmake @@ -174,6 +174,17 @@ GTK_INST_VERSION=2.16 PANGO_INST_VERSION=1.24 # +# Mandatory for GTK >= 2: Gettext +# +# Set GETTEXT_DIR to the directory in which the +# GETTEXT include files and library resides. +# +#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5 +GETTEXT_PKG=-runtime-0.17-1 +GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1 +GETTEXT_DLL=intl.dll + +# # Optional: WinPcap developer's pack to capture network traffic. # # If you have the WinPcap developer's pack (at least version 3.0), @@ -310,16 +321,6 @@ PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2 PORTAUDIO_VERSION=19 # -# Mandatory for GTK >= 2: Gettext -# -# Set GETTEXT_DIR to the directory in which the -# GETTEXT include files and library resides. -# -#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5 -GETTEXT_PKG=-runtime-0.17-1 -GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.17-1 -GETTEXT_DLL=intl.dll -# # Optional: AirPcap developer's pack to capture wireless network traffic # incl. 802.11 management frames. # @@ -394,6 +395,17 @@ GTK_INST_VERSION=2.16 PANGO_INST_VERSION=1.24 # +# Mandatory for GTK >= 2: Gettext +# +# Set GETTEXT_DIR to the directory in which the +# GETTEXT include files and library resides. +# +#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5 +GETTEXT_PKG=_0.17-1_win64 +GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.17-1 +GETTEXT_DLL=libintl-8.dll + +# # Optional: WinPcap developer's pack to capture network traffic. # # If you have the WinPcap developer's pack (at least version 3.0), @@ -530,16 +542,6 @@ PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2 PORTAUDIO_VERSION=19 # -# Mandatory for GTK >= 2: Gettext -# -# Set GETTEXT_DIR to the directory in which the -# GETTEXT include files and library resides. -# -#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5 -GETTEXT_PKG=_0.17-1_win64 -GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.17-1 -GETTEXT_DLL=libintl-8.dll -# # Optional: AirPcap developer's pack to capture wireless network traffic # incl. 802.11 management frames. # |