diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-09-25 16:09:58 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-09-25 16:09:58 +0000 |
| commit | 6b4a7ba74dbdddae0a55ec2d2c563711dc8abdb5 (patch) | |
| tree | 820385d1779e4b1f16037a1f8dc9f6504c7ece6a /config.nmake | |
| parent | 81108a948b36381986ccd953a49e1e4c97fe2d15 (diff) | |
| download | wireshark-6b4a7ba74dbdddae0a55ec2d2c563711dc8abdb5.tar.gz | |
Use GTK+ 2.12
svn path=/trunk/; revision=22955
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index d334c1b6b6..7a9ce5a526 100644 --- a/config.nmake +++ b/config.nmake @@ -121,8 +121,8 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2 #GTK2_INST_VERSION=2.8 #PANGO_INST_VERSION=1.14 # GTK 2.10 is the mainline since Wireshark 0.99.5 -GTK2_INST_VERSION=2.10 -PANGO_INST_VERSION=1.16 +GTK2_INST_VERSION=2.12 +PANGO_INST_VERSION=1.18 # # If you have GTK-Wimp, set this to the pathname of the directory in @@ -573,7 +573,18 @@ GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \ $(GTK2_DIR)\lib\pango-1.0.lib \ $(GLIB_LIBS) -!IF "$(GTK2_INST_VERSION)" == "2.10" +!IF "$(GTK2_INST_VERSION)" == "2.12" +GTK2_LIB_DIR=2.10.0 +NEED_LIBPNG_DLL=USE +NEED_LIBJPEG_DLL=USE +NEED_LIBTIFF_DLL=USE +NEED_CAIRO_DLL=USE +GTK_WIMP_DIR=DUMMY_TO_USE_WIMP +GTK_WIMP_DLLSRC_DIR=$(GTK2_DIR)\lib\gtk-2.0\2.10.0\engines +GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines +GTK_WIMP_RCSRC_DIR=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0 +GTK_WIMP_RCDST_DIR=etc\gtk-2.0 +!ELSEIF "$(GTK2_INST_VERSION)" == "2.10" GTK2_LIB_DIR=2.10.0 NEED_LIBPNG_DLL=USE NEED_CAIRO_DLL=USE @@ -602,7 +613,9 @@ 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.14" +!IF "$(PANGO_INST_VERSION)" == "1.18" +PANGO_LIB_DIR=1.5.0 +!ELSEIF "$(PANGO_INST_VERSION)" == "1.14" PANGO_LIB_DIR=1.5.0 !ELSEIF "$(PANGO_INST_VERSION)" == "1.10" PANGO_LIB_DIR=1.4.0 |