diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-03-19 06:42:46 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-03-19 06:42:46 +0000 |
| commit | db6795dc82818e7e5526cc7b5757f317eb63f6a1 (patch) | |
| tree | dc8ec723e621b8804ec3f1b02780305a068966a0 /config.nmake | |
| parent | 40b778e01c7b59146468a92e296d3e41a0173bf6 (diff) | |
Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27796
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/config.nmake b/config.nmake index 1eec731cc6..b8a957f0d5 100644 --- a/config.nmake +++ b/config.nmake @@ -135,7 +135,7 @@ NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe # Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x # GLIB_VERSION=2.0 -GLIB_PKG=2.18.4-1 +GLIB_PKG=2.20.0-1 GLIB_DIR=$(WIRESHARK_LIBS)\glib # @@ -147,13 +147,13 @@ GLIB_DIR=$(WIRESHARK_LIBS)\glib # directory in which the "include" and "lib" directories reside. # GTK_DIR=$(WIRESHARK_LIBS)\gtk2 -GTK_PKG=2.14.7-1 +GTK_PKG=2.16.0-2 CAIRO_PKG=1.8.6-1 ATK_PKG=1.24.0-1 -LIBPNG_PKG=1.2.32-1 -TIFF_PKG=tiff-3.8.2-1-bin +LIBPNG_PKG=1.2.34-1 +TIFF_PKG=libtiff-3.8.2 JPEG_PKG=jpeg-6b-4-bin -PANGO_PKG=1.22.2-1 +PANGO_PKG=1.24.0-1 # # Mandatory: Version numbers of GTK and pango. @@ -162,8 +162,8 @@ PANGO_PKG=1.22.2-1 # These macros are used by the nsis installer script and by the setup target. # # GTK 2.12 is the mainline since Wireshark 0.99.7 -GTK_INST_VERSION=2.14 -PANGO_INST_VERSION=1.22 +GTK_INST_VERSION=2.16 +PANGO_INST_VERSION=1.24 # # Optional: WinPcap developer's pack to capture network traffic. @@ -905,7 +905,17 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \ $(GTK_DIR)\lib\pango-1.0.lib \ $(GLIB_LIBS) -!IF "$(GTK_INST_VERSION)" == "2.14" +!IF "$(GTK_INST_VERSION)" == "2.16" +GTK_LIB_DIR=2.10.0 +NEED_LIBPNG_DLL=USE +NEED_LIBJPEG_DLL=USE +NEED_LIBTIFF_DLL=USE +NEED_CAIRO_DLL=USE +GTK_WIMP_DLLSRC_DIR=$(GTK_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=$(GTK_DIR)\share\themes\MS-Windows\gtk-2.0 +GTK_WIMP_RCDST_DIR=etc\gtk-2.0 +!ELSEIF "$(GTK_INST_VERSION)" == "2.14" GTK_LIB_DIR=2.10.0 NEED_LIBPNG_DLL=USE NEED_LIBJPEG_DLL=USE @@ -929,7 +939,9 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0 !ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.22" +!IF "$(PANGO_INST_VERSION)" == "1.24" +PANGO_LIB_DIR=1.5.0 +!ELSEIF "$(PANGO_INST_VERSION)" == "1.22" PANGO_LIB_DIR=1.5.0 !ELSEIF "$(PANGO_INST_VERSION)" == "1.18" PANGO_LIB_DIR=1.5.0 |