diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-10-25 09:59:40 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-10-25 09:59:40 +0000 |
| commit | c5ce562d607ad1c714ba645ef5ee4f8412ee2fa4 (patch) | |
| tree | ffcc952fdfb1b985a97e5168fd65a22cb78eac74 /config.nmake | |
| parent | 1637e691183cee8457231076654c5e25b06b257d (diff) | |
| download | wireshark-c5ce562d607ad1c714ba645ef5ee4f8412ee2fa4.tar.gz wireshark-c5ce562d607ad1c714ba645ef5ee4f8412ee2fa4.tar.bz2 wireshark-c5ce562d607ad1c714ba645ef5ee4f8412ee2fa4.zip | |
Use pango 1.26
svn path=/trunk/; revision=30687
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake index d68a7e648b..87ca9d0818 100644 --- a/config.nmake +++ b/config.nmake @@ -167,7 +167,7 @@ ATK_PKG=1.26.0-1 LIBPNG_PKG=1.2.39-1 TIFF_PKG=libtiff_3.9.1-1_win32 JPEG_PKG=jpeg_7-1_win32 -PANGO_PKG=1.24.5-2 +PANGO_PKG=1.26.0-1 FREETYPE_PKG=2.3.9-1 FONTCONFIG_PKG=2.7.3-1 EXPAT_PKG=2.0.1-1 @@ -180,7 +180,7 @@ EXPAT_PKG=2.0.1-1 # # GTK 2.12 is the mainline since Wireshark 0.99.7 GTK_INST_VERSION=2.16 -PANGO_INST_VERSION=1.24 +PANGO_INST_VERSION=1.26 # # Mandatory for GTK >= 2: Gettext @@ -964,14 +964,14 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0 !ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" || "$(PANGO_INST_VERSION)" == "1.18" || "$(PANGO_INST_VERSION)" == "1.16" +!IF "$(PANGO_INST_VERSION)" == "1.26" || "$(PANGO_INST_VERSION)" == "1.24" || "$(PANGO_INST_VERSION)" == "1.22" || "$(PANGO_INST_VERSION)" == "1.18" || "$(PANGO_INST_VERSION)" == "1.16" PANGO_LIB_DIR=1.5.0 !ELSE !ERROR ? Unknown or invalid PANGO_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.24" -#PANGO 1.24.5 Needs these: +!IF "$(PANGO_INST_VERSION)" == "1.26" || "$(PANGO_INST_VERSION)" == "1.24" +#PANGO >=1.24.5 Needs these: NEED_FREETYPE_DLL=USE NEED_FONTCONFIG_DLL=USE NEED_EXPAT_DLL=USE |