diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-03-17 21:33:15 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-03-17 21:33:15 +0000 |
| commit | e7ccbd26d17284d7cbbca7adedc7f235d97f341c (patch) | |
| tree | e7fe63b66830d059a5cc36c5e6e4edd9d5ad2008 /config.nmake | |
| parent | 2b4be62f25d456493eda9163550ea14b771373b8 (diff) | |
Revert the changes, it blows up when resizeing windows...
svn path=/trunk/; revision=27764
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/config.nmake b/config.nmake index 9a115cc9a6..34ab91195e 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.20.0-1 +GLIB_PKG=2.18.4-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.16.0-1 +GTK_PKG=2.14.7-1 CAIRO_PKG=1.8.6-1 ATK_PKG=1.24.0-1 -LIBPNG_PKG=1.2.34-1 -TIFF_PKG=libtiff-3.8.2 +LIBPNG_PKG=1.2.32-1 +TIFF_PKG=tiff-3.8.2-1-bin JPEG_PKG=jpeg-6b-4-bin -PANGO_PKG=1.24.0-1 +PANGO_PKG=1.22.2-1 # # Mandatory: Version numbers of GTK and pango. @@ -162,8 +162,8 @@ PANGO_PKG=1.24.0-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.16 -PANGO_INST_VERSION=1.24 +GTK_INST_VERSION=2.14 +PANGO_INST_VERSION=1.22 # # Optional: WinPcap developer's pack to capture network traffic. @@ -905,17 +905,7 @@ GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \ $(GTK_DIR)\lib\pango-1.0.lib \ $(GLIB_LIBS) -!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" +!IF "$(GTK_INST_VERSION)" == "2.14" GTK_LIB_DIR=2.10.0 NEED_LIBPNG_DLL=USE NEED_LIBJPEG_DLL=USE @@ -939,9 +929,7 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0 !ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.24" -PANGO_LIB_DIR=1.5.0 -!ELSEIF "$(PANGO_INST_VERSION)" == "1.22" +!IF "$(PANGO_INST_VERSION)" == "1.22" PANGO_LIB_DIR=1.5.0 !ELSEIF "$(PANGO_INST_VERSION)" == "1.18" PANGO_LIB_DIR=1.5.0 |