diff options
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 11aab9be57..562df24bf6 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -756,7 +756,7 @@ process_libs: !ENDIF !IFDEF LUA_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . lua5_1_dll.zip + lua5.1.4 lua5_1_4_Win32_dll9_lib.zip !ENDIF !IFDEF GNUTLS_DIR @@ -1077,7 +1077,7 @@ install-all: install-generated-files xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d !ENDIF !IFDEF LUA_DIR - xcopy "$(LUA_DIR)\lib\dll\lua5.1.dll" $(INSTALL_DIR) /d + xcopy "$(LUA_DIR)\lua5.1.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 32eb805039..0515256bd0 100644 --- a/config.nmake +++ b/config.nmake @@ -263,7 +263,7 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5 # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # -LUA_DIR=$(WIRESHARK_LIBS)\lua5.1 +LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4 # # Optional: the PORTAUDIO library enables audio output for RTP streams. @@ -801,7 +801,7 @@ LIBGCRYPT_CONFIG= !IFDEF LUA_DIR LUA_CFLAGS=/I$(LUA_DIR)\include -LUA_LIBS=$(LUA_DIR)\lib\dll\lua5.1.lib +LUA_LIBS=$(LUA_DIR)\lua5.1.lib # Nmake uses carets to escape special characters LUA_CONFIG=^#define HAVE_LUA 1 LUA_VERSION=^#define HAVE_LUA_5_1 1 diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index f9b191acbd..59ed1d80bd 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -334,7 +334,7 @@ File "${GNUTLS_DIR}\bin\libgpg-error-0.dll" File "${GNUTLS_DIR}\bin\libtasn1-3.dll" !endif !ifdef LUA_DIR -File "${LUA_DIR}\lib\dll\lua5.1.dll" +File "${LUA_DIR}\lua5.1.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 b4997cb87a..b41a9ed25b 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -7,7 +7,7 @@ # in order to provide backward compatibility with older trees (e.g. a # previous release or an older SVN checkout). # Save previous tag. -DOWNLOAD_TAG="2008-09-25" +DOWNLOAD_TAG="2008-10-01" DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/$DOWNLOAD_TAG/packages/" TAG_FILE="current_tag.txt" |