diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2008-09-25 20:32:00 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2008-09-25 20:32:00 +0000 |
| commit | b8140ea6045846356b7c169bf4f4053d5e47c148 (patch) | |
| tree | 12ed30c9cc1704ae60da1784727fc363bf4fa460 /config.nmake | |
| parent | d4a70f296149d2b13d67a0e7702480247762e3d5 (diff) | |
Yet another GTK+ update...
Overview of Changes from GTK+ 2.14.2 to 2.14.3
==============================================
* Revert problematic GtkAdjustment changes
* Bugs fixed:
552837 mem leak in gtkimmulticontext
553000 incorrect i18n header in gtkfilesystem.c
553135 eog crash: assertion failed
552545 leaks GpImage
svn path=/trunk/; revision=26273
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index f21171dddd..32eb805039 100644 --- a/config.nmake +++ b/config.nmake @@ -41,7 +41,7 @@ WIRESHARK_LIBS=C:\wireshark-$(PLATFORM)-libs # Base directory, where your programs reside. # This setting is used only inside this file. # -PROGRAM_FILES=C:/Program Files +PROGRAM_FILES=$(PROGRAMFILES) # # Machine type for the compiler and linker @@ -146,7 +146,7 @@ GTK_DIR=$(WIRESHARK_LIBS)\gtk2 # # GTK 2.12 is the mainline since Wireshark 0.99.7 GTK_INST_VERSION=2.14 -PANGO_INST_VERSION=1.20 +PANGO_INST_VERSION=1.22 # # Optional: WinPcap developer's pack to capture network traffic. @@ -649,7 +649,7 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0 !ERROR ? Unknown or invalid GTK_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.20" +!IF "$(PANGO_INST_VERSION)" == "1.22" PANGO_LIB_DIR=1.5.0 !ELSEIF "$(PANGO_INST_VERSION)" == "1.18" PANGO_LIB_DIR=1.5.0 |