diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-16 13:34:37 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-16 13:34:37 +0000 |
commit | 48730e146e2fef8396dc165eaf1dbbe5ab9bc67c (patch) | |
tree | 4c0ad7e583b8535cc3bf610a7dce77065332e905 /config.nmake | |
parent | 2c2ac2bffece1f1015f33cbc1db0b22e58ec5d09 (diff) |
Use the latest GTK packages.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29943 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
-rw-r--r-- | config.nmake | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index dd4f6882b8..6649642b4a 100644 --- a/config.nmake +++ b/config.nmake @@ -139,7 +139,7 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe GLIB_VERSION=2.0 GLIB_DIR=$(WIRESHARK_LIBS)\glib # This macro is used by the setup target. -GLIB_PKG=2.20.4-1 +GLIB_PKG=2.20.5-1 ##### To Use new packet list uncomment this line #### ### Warning Experimental - work in progress @@ -157,14 +157,20 @@ GTK_DIR=$(WIRESHARK_LIBS)\gtk2 # These macros are used by the nsis installer script and by the install target. TIFF_DLL=libtiff3.dll JPEG_DLL=jpeg62.dll +FREETYPE_DLL=freetype6.dll +FONTCONFIG_DLL=libfontconfig-1.dll +EXPAT_DLL=libexpat-1.dll # These macros are used by the setup target. -GTK_PKG=2.16.5-1 -CAIRO_PKG=1.8.8-1 +GTK_PKG=2.16.6-1 +CAIRO_PKG=1.8.8-2 ATK_PKG=1.26.0-1 -LIBPNG_PKG=1.2.37-1 +LIBPNG_PKG=1.2.38-1 TIFF_PKG=libtiff-3.8.2 JPEG_PKG=jpeg-6b-4-bin -PANGO_PKG=1.24.5-1 +PANGO_PKG=1.24.5-2 +FREETYPE_PKG=2.3.9-1 +FONTCONFIG_PKG=2.7.3-1 +EXPAT_PKG=2.0.1-1 # # Mandatory: Version numbers of GTK and pango. @@ -366,7 +372,7 @@ GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.5ws GLIB_VERSION=2.0 GLIB_DIR=$(WIRESHARK_LIBS)\glib # This macro is used by the setup target. -GLIB_PKG=2.20.3-1 +GLIB_PKG=2.20.5-1 ##### To Use new packet list uncomment this line #### ### Warning Experimental - work in progress @@ -949,6 +955,12 @@ PANGO_LIB_DIR=1.5.0 !ERROR ? Unknown or invalid PANGO_INST_VERSION !ENDIF +!IF "$(PANGO_INST_VERSION)" == "1.24" +#PANGO 1.24.5 Needs these: +NEED_FREETYPE_DLL=USE +NEED_FONTCONFIG_DLL=USE +NEED_EXPAT_DLL=USE +!ENDIF !IFDEF AIRPCAP_DIR AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1 AIRPDCAP_CONFIG=^#define HAVE_AIRPDCAP 1 |