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 /Makefile.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 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 9b515e4532..6bdb268a48 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -505,9 +505,9 @@ verify_tools: setup: verify_tools !IF "$(GTK2_INST_VERSION)" == "2.8" @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - glib gtk2.8/glib-2.8.4-20051212.zip + glib gtk2.8/glib-2.12.1.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - glib gtk2.8/glib-dev-2.8.4-20051212.zip + glib gtk2.8/glib-dev-2.12.1.zip !ELSEIF "$(GTK2_INST_VERSION)" == "2.6" @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ glib gtk2.6/glib-2.6.6.zip @@ -533,7 +533,7 @@ setup: verify_tools @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gettext-runtime-0.13.1 gettext-runtime-0.13.1.zip + gettext-0.14.5 gettext-0.14.5.zip !IFDEF NET_SNMP_DIR @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ . net-snmp-5.3.1.zip @@ -576,13 +576,13 @@ setup: verify_tools !IFDEF GTK2_DIR !IF "$(GTK2_INST_VERSION)" == "2.8" @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.8/gtk+-2.8.9.zip + gtk2 gtk2.8/gtk+-2.8.20.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.8/gtk+-dev-2.8.9.zip + gtk2 gtk2.8/gtk+-dev-2.8.20.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.8/cairo-1.0.2.zip + gtk2 gtk2.8/cairo-1.2.2.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.8/cairo-dev-1.0.2.zip + gtk2 gtk2.8/cairo-dev-1.2.2.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ gtk2 gtk2.8/atk-1.10.3.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ @@ -617,7 +617,12 @@ setup: verify_tools @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ gtk2 gtk2/atk-dev-1.4.0.zip !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.10" +!IF "$(PANGO_INST_VERSION)" == "1.12" + @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ + gtk2 gtk2.8/pango-1.12.3.zip + @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ + gtk2 gtk2.8/pango-dev-1.12.3.zip +!ELSEIF "$(PANGO_INST_VERSION)" == "1.10" @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ gtk2 gtk2.8/pango-1.10.1.zip @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ |