diff options
author | Anders Broman <anders.broman@ericsson.com> | 2008-12-27 16:24:16 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2008-12-27 16:24:16 +0000 |
commit | 960cd2feee820ca007b00089a849dcc84404d540 (patch) | |
tree | 7006a941482316580777edc4447a29c0959c1d18 /Makefile.nmake | |
parent | 5f96568834b9dd462d22e43fada17d84b3b82145 (diff) |
Use GTK+ 2.14.6
svn path=/trunk/; revision=27121
Diffstat (limited to 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 53850e625a..11888bfc35 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -795,9 +795,9 @@ process_libs: !IFDEF GTK_DIR !IF "$(GTK_INST_VERSION)" == "2.14" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.14/gtk+_2.14.5-1_win32.zip + gtk2 gtk2.14/gtk+_2.14.6-1_win32.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.14/gtk+-dev_2.14.5-1_win32.zip + gtk2 gtk2.14/gtk+-dev_2.14.6-1_win32.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.14/cairo_1.8.0-1_win32.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -836,9 +836,9 @@ process_libs: !ENDIF !IF "$(PANGO_INST_VERSION)" == "1.22" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.14/pango_1.22.0-1_win32.zip + gtk2 gtk2.14/pango_1.22.2-1_win32.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.14/pango-dev_1.22.0-1_win32.zip + gtk2 gtk2.14/pango-dev_1.22.2-1_win32.zip !ELSE !ERROR ? Unknown or invalid PANGO_INST_VERSION !ENDIF |