diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-01-29 18:55:28 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-01-29 18:55:28 +0000 |
| commit | 1401a76e91527f6b6c06f31fbb0cb2eba3d72b71 (patch) | |
| tree | 2599592380884da3d3074ece0bb160e801fa5481 /Makefile.nmake | |
| parent | 7ec0e2631868f1ca9e1cdc076d71b2c5e5ea854f (diff) | |
| download | wireshark-1401a76e91527f6b6c06f31fbb0cb2eba3d72b71.tar.gz wireshark-1401a76e91527f6b6c06f31fbb0cb2eba3d72b71.tar.bz2 wireshark-1401a76e91527f6b6c06f31fbb0cb2eba3d72b71.zip | |
For Windows: Update to use Gtk+ 2.12.6; Use latest Glib 2.14.5 again;
Gtk 2.12.6 fixes bugzilla.gnome.org bug #503326 which thus means that
Wireshark no longer needs a work-around for Wireshark bug #2066.
(See svn #24219).
svn path=/trunk/; revision=24221
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 72d9b9a463..04fc7447eb 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -642,9 +642,9 @@ process_libs: if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS) !IF "$(GTK2_INST_VERSION)" == "2.12" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk2.12/glib-2.14.3.zip + glib gtk2.12/glib-2.14.5.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk2.12/glib-dev-2.14.3.zip + glib gtk2.12/glib-dev-2.14.5.zip !ELSEIF "$(GTK2_INST_VERSION)" == "2.10" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ glib gtk2.10/glib-2.12.13.zip @@ -713,9 +713,9 @@ process_libs: !IFDEF GTK2_DIR !IF "$(GTK2_INST_VERSION)" == "2.12" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/gtk+-2.12.1.zip + gtk2 gtk2.12/gtk+-2.12.6.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/gtk+-dev-2.12.1.zip + gtk2 gtk2.12/gtk+-dev-2.12.6.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/cairo-1.4.14.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ |