Update to the latest Windows library tags. Add an "install_qt" target.

svn path=/trunk/; revision=52558

diff --git a/Makefile.nmake b/Makefile.nmake
index e012f1bd3bcd4254c75d419ddf74b62b0c72aa01..2eb5e220d0d78fa3107b49d1daa28bcfb16e5251 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -910,7 +910,10 @@ $(CHECK_TAG): _FORCE_
 # contain old files remaining from a previous setup run.
 setup: verify_tools clean_setup process_libs
 
-
+install_qt:
+       $(SH) $(WIN_SETUP) --download "C:\Qt" \
+               . Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws.zip
+       
 # The process_libs target when invoked causes either a --libverify or a --download for all the required libraries.
 # (The choice is determined by the value of the macro WIN_SETUP_OPT).
 process_libs:

diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 6e4720ded2357f0c98cb2f35f4a1beb2228df688..9d3dd6f6d513703feafcc3ec97b0f3a23c103e54 100755 (executable)
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -24,7 +24,7 @@
 
 # 32-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2013-07-19"
+export DOWNLOAD_TAG="2013-10-11"
 export WIRESHARK_TARGET_PLATFORM="win32"
 
 WIN_SETUP=`echo $0 | sed -e s/win32/win/`

diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh
index 0d8d359ccc32c677bce379d8cd31f92e9b62d9c2..7c593472dfa1e679fa5d28bdc29dd9322e560efe 100755 (executable)
--- a/tools/win64-setup.sh
+++ b/tools/win64-setup.sh
@@ -24,7 +24,7 @@
 
 # 64-bit wrapper for win-setup.sh.
 
-export DOWNLOAD_TAG="2013-07-19"
+export DOWNLOAD_TAG="2013-10-11"
 export WIRESHARK_TARGET_PLATFORM="win64"
 
 WIN_SETUP=`echo $0 | sed -e s/win64/win/`