diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-11-12 22:18:50 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-11-12 22:18:50 +0000 |
| commit | 09bd61c23374adcb04dce0e801fd5a58b7632ea9 (patch) | |
| tree | f0e8c5cc1668bff40fd4ac6d850dbdca9dee3fd6 /config.nmake | |
| parent | 63cd996fa59bbbcd25d536153e77c4e9e51f5046 (diff) | |
| download | wireshark-09bd61c23374adcb04dce0e801fd5a58b7632ea9.tar.gz | |
Update to use the latest gtk 2.8 glib and pango libraries.
Note from a mail on gtk dev list:
-rwxr-xr-x 1 tml Administ 224510 Oct 3 18:35 libpango-1.0-0.dll
-rwxr-xr-x 1 tml Administ 37952 Oct 3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x 1 tml Administ 58749 Oct 3 18:35 libpangowin32-1.0-0.dll
(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)
svn path=/trunk/; revision=19880
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 3e6bf59c8b..6c5dce2ae3 100644 --- a/config.nmake +++ b/config.nmake @@ -66,7 +66,7 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2 #PANGO_INST_VERSION=1.8 # Support for GTK 2.8 is currently experimental ... GTK2_INST_VERSION=2.8 -PANGO_INST_VERSION=1.12 +PANGO_INST_VERSION=1.14 # # If you have GTK-Wimp, set this to the pathname of the directory in @@ -446,7 +446,7 @@ GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0 !ENDIF # the lib dir of PANGO changed in 1.12 -!IF "$(PANGO_INST_VERSION)" == "1.12" +!IF "$(PANGO_INST_VERSION)" == "1.14" PANGO_LIB_DIR=1.5.0 !ELSEIF "$(PANGO_INST_VERSION)" == "1.10" PANGO_LIB_DIR=1.4.0 |