aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-04-24 19:45:29 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-04-24 19:45:29 +0000
commit8fbe2f530ad211a7f9b98cfe95cd0e7cbd99416a (patch)
tree5aa7bbe85d0122a08b5cd737b31ca9f1425842fe /Makefile.nmake
parentb7051d5fd66c91e4608b37a602183a95062f6ef1 (diff)
Use cairo-1.6.4-1 and pango-dev-1.20.2
svn path=/trunk/; revision=25165
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index baa99db57f..793d6dbb72 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -717,9 +717,9 @@ process_libs:
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/gtk+-dev-2.12.9.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.12/cairo-1.6.4.zip
+ gtk2 gtk2.12/cairo-1.6.4-1.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.12/cairo-dev-1.6.4.zip
+ gtk2 gtk2.12/cairo-dev-1.6.4-1.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.12/atk-1.22.0.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -750,9 +750,9 @@ process_libs:
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.20"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.12/pango-1.20.0.zip
+ gtk2 gtk2.12/pango-1.20.2.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.12/pango-dev-1.20.0.zip
+ gtk2 gtk2.12/pango-dev-1.20.2.zip
!ELSEIF "$(PANGO_INST_VERSION)" == "1.16"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
gtk2 gtk2.10/pango-1.16.4.zip