diff options
-rw-r--r-- | Makefile.nmake | 5 | ||||
-rw-r--r-- | config.nmake | 10 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
-rwxr-xr-x | tools/win32-setup.sh | 2 | ||||
-rwxr-xr-x | tools/win64-setup.sh | 2 | ||||
-rw-r--r-- | ui/qt/QtShark.pro | 2 |
6 files changed, 12 insertions, 11 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 09662e9cd8..32f8c2e0b1 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1011,7 +1011,7 @@ process_libs: !ENDIF !IFDEF LUA_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - lua5.1.4 lua$(LUA_DIST)_lib.zip + lua5.2.1 lua$(LUA_DIST)_lib.zip !ENDIF !IFDEF GNUTLS_PKG @@ -1087,6 +1087,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 libsmi-0.4.5 rm -r -f libsmi-0.4.8 rm -r -f libsmi-svn-40773-win??ws @@ -1357,7 +1358,7 @@ install-all: install-generated-files ! ENDIF !ENDIF !IFDEF LUA_DIR - xcopy "$(LUA_DIR)\lua5.1.dll" $(INSTALL_DIR) /d + xcopy "$(LUA_DIR)\lua52.dll" $(INSTALL_DIR) /d !ENDIF !IFDEF SMI_DIR if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp diff --git a/config.nmake b/config.nmake index 02fa27e0e1..d0f55296c9 100644 --- a/config.nmake +++ b/config.nmake @@ -449,8 +449,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_1_4_Win32_dll6 -LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4 +LUA_DIST=-5.2.1_Win32_dll10 +LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.1 # # Optional: the PORTAUDIO library enables audio output for RTP streams. @@ -696,8 +696,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.1.4_Win64_dll10 -LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4 +LUA_DIST=-5.2.1_Win64_dll10 +LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.1 # # Optional: the PORTAUDIO library enables audio output for RTP streams. @@ -1598,7 +1598,7 @@ LIBGCRYPT_CONFIG= !IFDEF LUA_DIR LUA_CFLAGS=/I$(LUA_DIR)\include -LUA_LIBS=$(LUA_DIR)\lua5.1.lib +LUA_LIBS=$(LUA_DIR)\lua52.lib # Nmake uses carets to escape special characters LUA_CONFIG=^#define HAVE_LUA 1 LUA_VERSION=^#define HAVE_LUA 1 diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index d525a0522b..5cd71ee446 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -323,7 +323,7 @@ File "${STAGING_DIR}\libintl-8.dll" SkipLibIntl8: !endif !ifdef LUA_DIR -File "${STAGING_DIR}\lua5.1.dll" +File "${STAGING_DIR}\lua52.dll" File "..\..\epan\wslua\init.lua" File "..\..\epan\wslua\console.lua" File "..\..\epan\wslua\dtd_gen.lua" diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index b4805c504e..239321e197 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="2013-10-12" +export DOWNLOAD_TAG="2014-03-29" 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 437839c89b..b629a0ee23 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="2013-10-12" +export DOWNLOAD_TAG="2014-03-29" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 7e6c601620..ebb35c97c0 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -444,7 +444,7 @@ win32 { $${GNUTLS_DIR}/bin/libgcrypt-11.dll $${GNUTLS_DIR}/bin/libgnutls-26.dll \ $${GNUTLS_DIR}/bin/libgpg-error-0.dll $${GNUTLS_DIR}/bin/libtasn1-3.dll \ $${GNUTLS_DIR}/bin/libintl-8.dll $${SMI_DIR}/bin/libsmi-2.dll \ - $${LUA_DIR}/lua5.1.dll \ + $${LUA_DIR}/lua52.dll \ $${GEOIP_DIR}/bin/libGeoIP-1.dll \ $${WINSPARKLE_DIR}/WinSparkle.dll \ ../../colorfilters ../../dfilters ../../cfilters |