diff options
| author | Gerald Combs <gerald@wireshark.org> | 2010-02-24 21:08:09 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2010-02-24 21:08:09 +0000 |
| commit | a5b39ae47a38f2aa47534c96f757aa353d40dc4b (patch) | |
| tree | bcf79d1ba88c272aa216c522f58f42f03e30a96a /config.nmake | |
| parent | bae37cf3ac448de559f4c309ba22b790b04f37bb (diff) | |
| download | wireshark-a5b39ae47a38f2aa47534c96f757aa353d40dc4b.tar.gz | |
Use the latest GTK+ 2.16 bundle. For the Win32 build this means downgrading
from GTK+ 2.18. According to https://bugzilla.gnome.org/show_bug.cgi?id=598299
we should probably hold off on using 2.18 for a while.
svn path=/trunk/; revision=31992
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index 341d8f9b60..7afc9bdf90 100644 --- a/config.nmake +++ b/config.nmake @@ -158,7 +158,7 @@ FONTCONFIG_DLL=libfontconfig-1.dll EXPAT_DLL=libexpat-1.dll INTL_DLL=intl.dll # This macro is used by the setup target. -GTK_PKG=2.18.7-20100213 +GTK_PKG=2.16.6-20100207 # # Mandatory: Version numbers of GTK and pango. @@ -166,7 +166,7 @@ GTK_PKG=2.18.7-20100213 # (MAJOR + MINOR Version number but without MICRO version number) # These macros are used by the nsis installer script and by the setup target. # -GTK_INST_VERSION=2.18 +GTK_INST_VERSION=2.16 # # Optional: WinPcap developer's pack to capture network traffic. @@ -358,15 +358,16 @@ NEW_PACKET_LIST_CONFIG=^#define NEW_PACKET_LIST 1 # GTK_DIR=$(WIRESHARK_LIBS)\gtk2 # These macros are used by the nsis installer script and by the install target. -TIFF_DLL=libtiff-3.dll -JPEG_DLL=libjpeg-7.dll +PNG_DLL=libpng14-14.dll +#TIFF_DLL=libtiff-3.dll +#JPEG_DLL=libjpeg-7.dll FREETYPE_DLL=libfreetype-6.dll FONTCONFIG_DLL=libfontconfig-1.dll EXPAT_DLL=libexpat-1.dll INTL_DLL=libintl-8.dll # These macros are used by the setup target. -GTK_PKG=2.16.6-20090912 +GTK_PKG=2.16.6-20100208 # # Mandatory: Version numbers of GTK and pango. @@ -374,7 +375,7 @@ GTK_PKG=2.16.6-20090912 # (MAJOR + MINOR Version number but without MICRO version number) # These macros are used by the nsis installer script and by the setup target. # -GTK_INST_VERSION=2.18 +GTK_INST_VERSION=2.16 # # Optional: WinPcap developer's pack to capture network traffic. |