aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-11-15 16:36:27 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-11-15 16:36:27 +0000
commitf9f80c330e94d0416eca80ef4110644ac1b74197 (patch)
tree130f94572af158c1a419694e685f3aaf377d33c6 /Makefile.nmake
parent68ef96b3bfd225214fd1e39474506677e7abfe88 (diff)
Update GTK packages.
svn path=/trunk/; revision=26786
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 5296375063..c16aaacbd6 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -710,9 +710,9 @@ process_libs:
if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
!IF "$(GTK_INST_VERSION)" == "2.14"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- glib gtk2.14/glib_2.18.1-1_win32.zip
+ glib gtk2.14/glib_2.18.2-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- glib gtk2.14/glib-dev_2.18.1-1_win32.zip
+ glib gtk2.14/glib-dev_2.18.2-1_win32.zip
!ELSEIF "$(GTK_INST_VERSION)" == "2.12"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
glib gtk2.12/glib_2.18.0-1_win32.zip
@@ -778,13 +778,13 @@ 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.3-2_win32.zip
+ gtk2 gtk2.14/gtk+_2.14.4-2_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.14/gtk+-dev_2.14.3-2_win32.zip
+ gtk2 gtk2.14/gtk+-dev_2.14.4-2_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.14/cairo_1.7.6-1_win32.zip
+ gtk2 gtk2.14/cairo_1.8.0-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.14/cairo-dev_1.7.6-1_win32.zip
+ gtk2 gtk2.14/cairo-dev_1.8.0-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.14/atk_1.24.0-1_win32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \