aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2007-10-18 19:47:45 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2007-10-18 19:47:45 +0000
commitc1612bb7df43cf9f81b25544ebdfc1fbfe0c59ac (patch)
treeab278f89b7cf9026c3776fdc91e63b9f91885207
parentf1bcc5773bab8c0e31a1086817e1e7cf3c5aaea6 (diff)
Oops: Backout the library updates until libraries configured for download... (??)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23228 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--Makefile.nmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 831977bf80..9656019dea 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -617,9 +617,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.2.zip
+ glib gtk2.12/glib-2.14.1.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- glib gtk2.12/glib-dev-2.14.2.zip
+ glib gtk2.12/glib-dev-2.14.1.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
@@ -688,9 +688,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.0.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.0.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)" \
@@ -732,9 +732,9 @@ process_libs:
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.18"
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.12/pango-1.18.3.zip
+ gtk2 gtk2.12/pango-1.18.2.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gtk2 gtk2.12/pango-dev-1.18.3.zip
+ gtk2 gtk2.12/pango-dev-1.18.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