diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-11-29 21:34:38 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-11-29 21:34:38 +0000 |
| commit | 26c07ee766f76624a2516cc98b04c2e7219374ab (patch) | |
| tree | 8a15aaa954c3f9aed9bf6f122cbffe17f1422f76 /Makefile.nmake | |
| parent | c068f9acf2d13082059f2349283c6e69d85061bd (diff) | |
Update to gtk+ 2.14.2 and glib glib-2.14.4
svn path=/trunk/; revision=23674
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a87668233b..6b972c3070 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -637,9 +637,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.4.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.4.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 @@ -660,7 +660,7 @@ process_libs: @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gettext-0.14.5 gettext-0.14.5.zip + gettext-runtime-0.17 gettext-runtime-0.17.zip !IFDEF KFW_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ kfw-2.5 kfw-2.5.zip @@ -708,9 +708,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.2.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.2.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/cairo-1.4.10.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ |