aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-03-21 16:15:21 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-03-21 16:15:21 +0000
commit533063e063fc27b58424ced0134bd297c6036e00 (patch)
tree487f9e1961e298f7510db09105d84a3921c7ba8a /config.nmake
parent1a2b14d60c1aa8a5576b04b67f2cefda36196220 (diff)
Use the latest GTK libraries.
svn path=/trunk/; revision=24711
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake
index da2ce467eb..87e1941861 100644
--- a/config.nmake
+++ b/config.nmake
@@ -141,7 +141,7 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
#PANGO_INST_VERSION=1.16
# GTK 2.12 is the mainline since Wireshark 0.99.7
GTK2_INST_VERSION=2.12
-PANGO_INST_VERSION=1.18
+PANGO_INST_VERSION=1.20
#
# If you have GTK-Wimp, set this to the pathname of the directory in
@@ -652,7 +652,9 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0
!ERROR ? Unknown or invalid GTK2_INST_VERSION
!ENDIF
-!IF "$(PANGO_INST_VERSION)" == "1.18"
+!IF "$(PANGO_INST_VERSION)" == "1.20"
+PANGO_LIB_DIR=1.5.0
+!ELSEIF "$(PANGO_INST_VERSION)" == "1.18"
PANGO_LIB_DIR=1.5.0
!ELSEIF "$(PANGO_INST_VERSION)" == "1.16"
PANGO_LIB_DIR=1.5.0