diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-09-17 06:16:24 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-09-17 06:16:24 +0000 |
| commit | a601aeed88ca617f387fe0443dbcd1ba5a8a7e5c (patch) | |
| tree | aac939b33ae6cec582b7e66deb0e3ab993be987e | |
| parent | 3b2c741db60c754aaba03b4ba6e1321617eacb39 (diff) | |
Use latest GTK suport libs.
svn path=/trunk/; revision=29962
| -rw-r--r-- | config.nmake | 12 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake index 40b44d5cd2..c706b42036 100644 --- a/config.nmake +++ b/config.nmake @@ -155,8 +155,8 @@ GLIB_PKG=2.20.5-1 # GTK_DIR=$(WIRESHARK_LIBS)\gtk2 # These macros are used by the nsis installer script and by the install target. -TIFF_DLL=libtiff3.dll -JPEG_DLL=jpeg62.dll +TIFF_DLL=libtiff-3.dll +JPEG_DLL=libjpeg-7.dll FREETYPE_DLL=freetype6.dll FONTCONFIG_DLL=libfontconfig-1.dll EXPAT_DLL=libexpat-1.dll @@ -164,9 +164,9 @@ EXPAT_DLL=libexpat-1.dll GTK_PKG=2.16.6-1 CAIRO_PKG=1.8.8-2 ATK_PKG=1.26.0-1 -LIBPNG_PKG=1.2.38-1 -TIFF_PKG=libtiff-3.8.2 -JPEG_PKG=jpeg-6b-4-bin +LIBPNG_PKG=1.2.39-1 +TIFF_PKG=libtiff_3.9.1-1_win32 +JPEG_PKG=jpeg_7-1_win32 PANGO_PKG=1.24.5-2 FREETYPE_PKG=2.3.9-1 FONTCONFIG_PKG=2.7.3-1 @@ -399,7 +399,7 @@ CAIRO_PKG=1.8.8-2 ATK_PKG=1.26.0-2 LIBPNG_PKG=1.2.40-1 TIFF_PKG=libtiff_3.9.1-1_win64 -JPEG_PKG=jpeg_6b-2_win64 +JPEG_PKG=jpeg_7-1_win64 PANGO_PKG=1.24.5-2 FREETYPE_PKG=2.3.9-2 FONTCONFIG_PKG=2.7.3-1 diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 96c4be4aa5..2327cb226e 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -9,7 +9,7 @@ # in order to provide backward compatibility with older trees (e.g. a # previous release or an older SVN checkout). # Save previous tag. -DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-09-16B"} +DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-0916C"} WIRESHARK_TARGET_PLATFORM=${WIRESHARK_TARGET_PLATFORM:-"win32"} DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/" |