diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-03-29 10:00:33 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-03-29 16:30:53 +0000 |
| commit | a1d4189c5e9cd67d1509f626038b62d146f30282 (patch) | |
| tree | 70d5db95994cd6475325348727e8fc7384fe37e1 /config.nmake | |
| parent | adc46f571c0357f7600c5cc49c21a8e1403a2af0 (diff) | |
| download | wireshark-a1d4189c5e9cd67d1509f626038b62d146f30282.tar.gz | |
Upgrade Windows builds to Lua 5.2.1
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e
Reviewed-on: https://code.wireshark.org/review/863
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
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 |