diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2005-12-16 08:20:22 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2005-12-16 08:20:22 +0000 |
| commit | f2291acd18ffb66faa9da1e2b8a6bfd5249ffe8b (patch) | |
| tree | 68e3d945f1960af836513ab99fb33be556cc9df4 /config.nmake | |
| parent | fb6554117f62132fbf58ed6af47df9373a2b45f8 (diff) | |
Declare the GTK 2.6 as the official mainline now!!!
(as per mailing list discussions and mainly as the Gimp windows port also uses this version)
fix the NSIS install settings for GTK 2.6 of GTK-Wimp
svn path=/trunk/; revision=16820
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index 6a3cf2dcb2..1d6a57b6b8 100644 --- a/config.nmake +++ b/config.nmake @@ -81,11 +81,12 @@ GTK2_DIR=$(ETHEREAL_LIBS)\gtk2 #PANGO_INST_VERSION=1.2 #GTK2_INST_VERSION=2.4 #PANGO_INST_VERSION=1.4 -# Support for GTK 2.6 and 2.8 is currently very experimental ... -#GTK2_INST_VERSION=2.6 -#PANGO_INST_VERSION=1.8 -GTK2_INST_VERSION=2.8 -PANGO_INST_VERSION=1.10 +# GTK 2.6 is the mainline since Ethereal 0.10.14 +GTK2_INST_VERSION=2.6 +PANGO_INST_VERSION=1.8 +# Support for GTK 2.8 is currently experimental ... +#GTK2_INST_VERSION=2.8 +#PANGO_INST_VERSION=1.10 # # If you have GTK-Wimp, set this to the pathname of the directory in @@ -94,8 +95,11 @@ PANGO_INST_VERSION=1.10 # If you don't have GTK-Wimp, comment this line out, so that GTK-Wimp isn't # defined. # +# Please note: GTK 2.8 (and later?) includes GTK-Wimp +# (in this case these GTK-Wimp related settings will have no effect) +# GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp -GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme +GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0 # # If you have Zlib, set this to the pathname of the directory in |