diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-10-26 07:25:07 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-10-26 07:25:07 +0000 |
| commit | 0880bc54d02547204d0a5754301d596c225dd15f (patch) | |
| tree | 7070e691db778c9a48895738b0b68075e2f7f05e /config.nmake | |
| parent | f0c62ba9c8ecafa86cb36cff8b4c66791207eb99 (diff) | |
Preparations for using the latest GTK 2.8 files for now only gettext is updated.
svn path=/trunk/; revision=19695
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index 2aeca098ec..73bb3094f5 100644 --- a/config.nmake +++ b/config.nmake @@ -69,7 +69,7 @@ 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 +#PANGO_INST_VERSION=1.12 # # If you have GTK-Wimp, set this to the pathname of the directory in @@ -228,7 +228,8 @@ ICONV_DIR=$(WIRESHARK_LIBS)\libiconv-1.9.1.bin.woe32 # Set GETTEXT_DIR to the directory in which the # GETTEXT include files and library resides. # -GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.13.1 +#GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-runtime-0.13.1 +GETTEXT_DIR=$(WIRESHARK_LIBS)\gettext-0.14.5 # # Optional: AirPcap developer's pack to capture wireless network traffic @@ -444,8 +445,10 @@ GTK2_LIB_DIR=2.4.0 GTK2_LIB_DIR=2.2.0 !ENDIF -# the lib dir of PANGO didn't changed since 1.4.0 -!IF "$(PANGO_INST_VERSION)" == "1.10" +# the lib dir of PANGO changed in 1.12 +!IF "$(PANGO_INST_VERSION)" == "1.12" +PANGO_LIB_DIR=1.5.0 +!ELSEIF "$(PANGO_INST_VERSION)" == "1.10" PANGO_LIB_DIR=1.4.0 !ELSEIF "$(PANGO_INST_VERSION)" == "1.8" PANGO_LIB_DIR=1.4.0 |