Use the new bundle

svn path=/trunk/; revision=46613
This commit is contained in:
Anders Broman 2012-12-19 06:52:56 +00:00
parent 919c192780
commit acab4fe903
2 changed files with 7 additions and 7 deletions

View File

@ -273,8 +273,8 @@ PKG_SUFIX=ws
GDK_DLL=libgdk-3-0.dll
GTK_DLL=libgtk-3-0.dll
PKG_SUFIX=ws
GTK_PKG=3.4.0-3.9
#GTK_PKG=3.4.4-2.1
#GTK_PKG=3.4.0-3.9
GTK_PKG=3.4.4-2.1
!ENDIF
#
@ -479,15 +479,15 @@ XML_DLL=libxml2-2.dll
!IF "$(GTK_NAME)" == "gtk2"
GDK_DLL=libgdk-win32-2.0-0.dll
GTK_DLL=libgtk-win32-2.0-0.dll
GTK_PKG=2.24.10-2.7
#GTK_PKG=2.24.14-1.1
#GTK_PKG=2.24.10-2.7
GTK_PKG=2.24.14-1.1
PKG_SUFIX=ws
!ELSE
GDK_DLL=libgdk-3-0.dll
GTK_DLL=libgtk-3-0.dll
PKG_SUFIX=ws
GTK_PKG=3.4.2-3.5
#GTK_PKG=3.4.4-2.1
#GTK_PKG=3.4.2-3.5
GTK_PKG=3.4.4-2.1
!ENDIF
#

View File

@ -4,7 +4,7 @@
# 64-bit wrapper for win-setup.sh.
export DOWNLOAD_TAG="2012-12-11"
export DOWNLOAD_TAG="2012-12-19"
export WIRESHARK_TARGET_PLATFORM="win64"
WIN_SETUP=`echo $0 | sed -e s/win64/win/`