From a1d4189c5e9cd67d1509f626038b62d146f30282 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sat, 29 Mar 2014 10:00:33 +0100 Subject: Upgrade Windows builds to Lua 5.2.1 Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e Reviewed-on: https://code.wireshark.org/review/863 Reviewed-by: Pascal Quantin Tested-by: Pascal Quantin --- config.nmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'config.nmake') 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 -- cgit v1.2.1