diff options
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | config.nmake | 8 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index fc06aa9ac1..77e66a9db3 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1009,7 +1009,7 @@ process_libs: !ENDIF !IFDEF LUA_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - lua5.2.1 lua$(LUA_DIST)_lib.zip + lua5.2.3 lua$(LUA_DIST)_lib.zip !ENDIF !IFDEF GNUTLS_PKG @@ -1085,7 +1085,7 @@ clean_setup: rm -r -f libiconv-1.9.1.bin.woe32 rm -r -f lua5.1 rm -r -f lua5.1.4 - rm -r -f lua5.2.1 + rm -r -f lua5.2.? rm -r -f libsmi-0.4.5 rm -r -f libsmi-0.4.8 rm -r -f libsmi-svn-40773-win??ws diff --git a/config.nmake b/config.nmake index b3dff9facf..40a1484c8e 100644 --- a/config.nmake +++ b/config.nmake @@ -447,8 +447,8 @@ KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6 # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # -LUA_DIST=-5.2.1_Win32_dll10 -LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.1 +LUA_DIST=-5.2.3_Win32_dllw4 +LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 # # Optional: the PORTAUDIO library enables audio output for RTP streams. @@ -694,8 +694,8 @@ GNUTLS_PKG=2.12.18-1.2-1 # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # -LUA_DIST=-5.2.1_Win64_dll10 -LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.1 +LUA_DIST=-5.2.3_Win64_dllw4 +LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 # # Optional: the PORTAUDIO library enables audio output for RTP streams. diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 239321e197..fd47dfdaed 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -22,7 +22,7 @@ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2014-03-29" +export DOWNLOAD_TAG="2014-04-05" 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 b629a0ee23..5691b79a7f 100755 --- a/tools/win64-setup.sh +++ b/tools/win64-setup.sh @@ -22,7 +22,7 @@ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2014-03-29" +export DOWNLOAD_TAG="2014-04-05" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |