diff options
-rw-r--r-- | Makefile.nmake | 18 | ||||
-rw-r--r-- | config.nmake | 6 | ||||
-rwxr-xr-x | tools/win32-setup.sh | 4 |
3 files changed, 15 insertions, 13 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 5ab0fa14f1..9954292483 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -667,9 +667,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.6-2.zip + glib gtk2.12/glib-2.16.1.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk2.12/glib-dev-2.14.6-2.zip + glib gtk2.12/glib-dev-2.16.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 @@ -739,17 +739,17 @@ 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.8.zip + gtk2 gtk2.12/gtk+-2.12.9.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/gtk+-dev-2.12.8.zip + gtk2 gtk2.12/gtk+-dev-2.12.9.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/cairo-1.4.14.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/cairo-dev-1.4.14.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/atk-1.20.0.zip + gtk2 gtk2.12/atk-1.22.0.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/atk-dev-1.20.0.zip + gtk2 gtk2.12/atk-dev-1.22.0.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/libpng-1.2.8-bin.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -774,11 +774,11 @@ process_libs: !ELSE !ERROR ? Unknown or invalid GTK2_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.18" +!IF "$(PANGO_INST_VERSION)" == "1.20" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/pango-1.18.4.zip + gtk2 gtk2.12/pango-1.20.0.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/pango-dev-1.18.4.zip + gtk2 gtk2.12/pango-dev-1.20.0.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 diff --git a/config.nmake b/config.nmake index da2ce467eb..87e1941861 100644 --- a/config.nmake +++ b/config.nmake @@ -141,7 +141,7 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2 #PANGO_INST_VERSION=1.16 # GTK 2.12 is the mainline since Wireshark 0.99.7 GTK2_INST_VERSION=2.12 -PANGO_INST_VERSION=1.18 +PANGO_INST_VERSION=1.20 # # If you have GTK-Wimp, set this to the pathname of the directory in @@ -652,7 +652,9 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0 !ERROR ? Unknown or invalid GTK2_INST_VERSION !ENDIF -!IF "$(PANGO_INST_VERSION)" == "1.18" +!IF "$(PANGO_INST_VERSION)" == "1.20" +PANGO_LIB_DIR=1.5.0 +!ELSEIF "$(PANGO_INST_VERSION)" == "1.18" PANGO_LIB_DIR=1.5.0 !ELSEIF "$(PANGO_INST_VERSION)" == "1.16" PANGO_LIB_DIR=1.5.0 diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 0c6466f82d..c00b2b417b 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -7,8 +7,8 @@ # in order to provide backward compatibility with older trees (e.g. a # previous release or an older SVN checkout). # Save previous tag. -#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-02-16/packages/" -DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-03-17/packages/" +#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-03-17/packages/" +DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-03-21/packages/" # Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag. #DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/" |