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 /Makefile.nmake | |
| parent | adc46f571c0357f7600c5cc49c21a8e1403a2af0 (diff) | |
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 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 5 |
1 files changed, 3 insertions, 2 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 |