diff --git a/Cross-compiling b/Cross-compiling index b2e414b1d..31db08c42 100644 --- a/Cross-compiling +++ b/Cross-compiling @@ -409,7 +409,7 @@ Using the cross-compiler, build the following targets: b) Lua (mandatory in 3.7) - lib/lua-5.4.4/src + lib/lua-5.4.6/src from sources: lua.c, lapi.c, lauxlib.c, lbaselib.c, lcode.c, lcorolib.c, lctype.c, ldblib.c, ldebug.c, diff --git a/Porting b/Porting index 5be93f0e5..726015933 100644 --- a/Porting +++ b/Porting @@ -201,7 +201,7 @@ need to be included in the packaging of the game. 4.3. Lua Compile and link into a library, or obtain a prebuilt Lua library for -your platform. Place the Lua source into lib/lua-5.4.4 (or other folder +your platform. Place the Lua source into lib/lua-5.4.6 (or other folder representing an appropriate Lua version); place the compiled Lua library into lib. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b630ec893..1e7326565 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -138,7 +138,7 @@ steps: export LUASRC=../submodules/lua export ADD_CURSES=Y export PDCURSES_TOP=../submodules/pdcurses - export LUA_VERSION=5.4.4 + export LUA_VERSION=5.4.6 # # 64-bit #export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-9.0.0-ucrt-r5/winlibs-x86_64-posix-seh-gcc-11.2.0-mingw-w64ucrt-9.0.0-r5.zip @@ -238,7 +238,7 @@ steps: sh sys/msdos/fetch-cross-compiler.sh retVal=$? if [ $retVal -eq 0 ]; then - make LUA_VERSION=5.4.4 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package + make LUA_VERSION=5.4.6 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package fi condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross')) workingDirectory: $(Agent.BuildDirectory)/$(netHackPath) diff --git a/outdated/.travis.yml b/outdated/.travis.yml index 57cecc451..6c1842e42 100644 --- a/outdated/.travis.yml +++ b/outdated/.travis.yml @@ -3,7 +3,7 @@ matrix: include: - name: linux-xenial-gcc-win-all os: linux - env: HINTS=linux.370 LUA_VERSION=5.4.4 + env: HINTS=linux.370 LUA_VERSION=5.4.6 compiler: gcc addons: apt: @@ -21,7 +21,7 @@ matrix: - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - name: linux-bionic-gcc-win-all os: linux - env: HINTS=linux.370 LUA_VERSION=5.4.4 + env: HINTS=linux.370 LUA_VERSION=5.4.6 dist: bionic compiler: gcc addons: @@ -40,7 +40,7 @@ matrix: - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - name: linux-focal-clang-win-all os: linux - env: HINTS=linux.370 LUA_VERSION=5.4.4 + env: HINTS=linux.370 LUA_VERSION=5.4.6 dist: focal compiler: clang addons: @@ -59,7 +59,7 @@ matrix: - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - name: linux-xenial-gcc-nocommon os: linux - env: HINTS=linux.370 LUA_VERSION=5.4.4 + env: HINTS=linux.370 LUA_VERSION=5.4.6 dist: xenial compiler: gcc script: @@ -70,7 +70,7 @@ matrix: - make install - name: linux-focal-gcc9-win-all os: linux - env: HINTS=linux.370 LUA_VERSION=5.4.4 + env: HINTS=linux.370 LUA_VERSION=5.4.6 dist: focal compiler: gcc addons: @@ -91,7 +91,7 @@ matrix: - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - name: linux-xenial-gcc-minimal os: linux - env: HINTS=linux-minimal LUA_VERSION=5.4.4 + env: HINTS=linux-minimal LUA_VERSION=5.4.6 compiler: gcc script: | cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ @@ -129,7 +129,7 @@ matrix: script: - export ADD_CURSES=Y - export PDCURSES_TOP=../lib/pdcurses - - export LUA_VERSION=5.4.4 + - export LUA_VERSION=5.4.6 - sh sys/windows/travis-gcc.sh - test -d "lib/lua-$LUA_VERSION/src" || exit 0 - test -d "lib/pdcurses" || exit 0 @@ -138,7 +138,7 @@ matrix: - mingw32-make LUA_VERSION=$LUA_VERSION install - name: msdos-linux-focal-djgpp-crosscompile os: linux - env: HINTS=linux.370 LUA_VERSION=5.4.4 + env: HINTS=linux.370 LUA_VERSION=5.4.6 dist: focal compiler: gcc script: diff --git a/outdated/sys/unix/hints/include/cross-amiga-pre b/outdated/sys/unix/hints/include/cross-amiga-pre index fb04be1c2..5c59f102d 100644 --- a/outdated/sys/unix/hints/include/cross-amiga-pre +++ b/outdated/sys/unix/hints/include/cross-amiga-pre @@ -24,9 +24,9 @@ endif ifdef BUILD_TARGET_LUA #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz #================================================================= -LUA_VERSION ?=5.4.4 +LUA_VERSION ?=5.4.6 LUATOP ?= ../lib/lua-$(LUA_VERSION) LUASRCDIR ?= $(LUATOP)/src LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \ diff --git a/outdated/sys/windows/travis-gcc.sh b/outdated/sys/windows/travis-gcc.sh index fdbd5637c..c61137790 100644 --- a/outdated/sys/windows/travis-gcc.sh +++ b/outdated/sys/windows/travis-gcc.sh @@ -3,6 +3,6 @@ mkdir -p lib cd lib git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses #git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags -curl -R -O http://www.lua.org/ftp/lua-5.4.4.tar.gz -tar zxf lua-5.4.4.tar.gz +curl -R -O http://www.lua.org/ftp/lua-5.4.6.tar.gz +tar zxf lua-5.4.6.tar.gz cd ../ diff --git a/src/nhlua.c b/src/nhlua.c index 41f860f15..b272d567b 100644 --- a/src/nhlua.c +++ b/src/nhlua.c @@ -2020,7 +2020,7 @@ nhl_init(nhl_sandbox_info *sbi) /* It would be nice to import EXPECTED from each build system. XXX */ /* And it would be nice to do it only once, but it's cheap. */ #ifndef NHL_VERSION_EXPECTED -#define NHL_VERSION_EXPECTED 50404 +#define NHL_VERSION_EXPECTED 50406 #endif #ifdef NHL_SANDBOX diff --git a/sys/msdos/Install.dos b/sys/msdos/Install.dos index 5a084c6fa..35d250b84 100644 --- a/sys/msdos/Install.dos +++ b/sys/msdos/Install.dos @@ -42,7 +42,7 @@ II. There once was a time when people built NetHack right on their DOS machine. a DOS-extender (for including in msdos packaging) from: http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip and Lua from: - http://www.lua.org/ftp/lua-5.4.4.tar.gz + http://www.lua.org/ftp/lua-5.4.6.tar.gz If you want the DOSVGA build, to support higher resolutions and Unicode symbols, you also need: diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index 065d52967..b7fee8c46 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -50,13 +50,13 @@ endif ifeq "$(LUA_VERSION)" "5.3.5" LUAVER=535 else -LUAVER=544 +LUAVER=546 endif #--------------------------------------------------------------- # Location of LUA # # Original source needs to be obtained from: -# http://www.lua.org/ftp/lua-5.4.4.tar.gz +# http://www.lua.org/ftp/lua-5.4.6.tar.gz # # This build assumes that the LUA sources are located # at the specified location. If they are actually elsewhere @@ -319,7 +319,7 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ) #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz #================================================================= LUASRC = $(LUATOP)/src diff --git a/sys/msdos/fetch-cross-compiler.sh b/sys/msdos/fetch-cross-compiler.sh index 1bf846e65..e64e132a3 100755 --- a/sys/msdos/fetch-cross-compiler.sh +++ b/sys/msdos/fetch-cross-compiler.sh @@ -15,7 +15,7 @@ if [ -z "$GCCVER" ]; then fi if [ -z "$LUA_VERSION" ]; then - export LUA_VERSION=5.4.4 + export LUA_VERSION=5.4.6 fi if [ ! -d "$(pwd)/lib" ]; then diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top index d66d4bdca..cfbaad364 100644 --- a/sys/unix/Makefile.top +++ b/sys/unix/Makefile.top @@ -85,7 +85,7 @@ VARDAT = $(VARDATD) $(VARDATND) #CHGRP = chgrp # Lua version -LUA_VERSION = 5.4.4 +LUA_VERSION = 5.4.6 # # end of configuration diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj index 6a90fa9c8..dfd3473d2 100644 --- a/sys/unix/NetHack.xcodeproj/project.pbxproj +++ b/sys/unix/NetHack.xcodeproj/project.pbxproj @@ -519,40 +519,40 @@ 54FB2B4A246310A600397C0E /* symbols.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = symbols.c; path = ../../src/symbols.c; sourceTree = ""; }; 54FCE8282223261F00F393C8 /* isaac64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isaac64.c; path = ../../src/isaac64.c; sourceTree = ""; }; BAE8010A27B97760002B3786 /* libnhlua.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnhlua.a; sourceTree = BUILT_PRODUCTS_DIR; }; - BAE8011427B99CAB002B3786 /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = "../../lib/lua-5.4.4/src/lopcodes.c"; sourceTree = ""; }; - BAE8011527B99CAB002B3786 /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = "../../lib/lua-5.4.4/src/linit.c"; sourceTree = ""; }; - BAE8011627B99CAB002B3786 /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = "../../lib/lua-5.4.4/src/lobject.c"; sourceTree = ""; }; - BAE8011727B99CAC002B3786 /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = "../../lib/lua-5.4.4/src/loslib.c"; sourceTree = ""; }; - BAE8011827B99CAC002B3786 /* lcorolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcorolib.c; path = "../../lib/lua-5.4.4/src/lcorolib.c"; sourceTree = ""; }; - BAE8011927B99CAC002B3786 /* lutf8lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lutf8lib.c; path = "../../lib/lua-5.4.4/src/lutf8lib.c"; sourceTree = ""; }; - BAE8011A27B99CAC002B3786 /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = "../../lib/lua-5.4.4/src/ltable.c"; sourceTree = ""; }; - BAE8011B27B99CAC002B3786 /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = "../../lib/lua-5.4.4/src/ltablib.c"; sourceTree = ""; }; - BAE8011C27B99CAC002B3786 /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = "../../lib/lua-5.4.4/src/llex.c"; sourceTree = ""; }; - BAE8011D27B99CAC002B3786 /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = "../../lib/lua-5.4.4/src/lcode.c"; sourceTree = ""; }; - BAE8011E27B99CAC002B3786 /* lua.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lua.c; path = "../../lib/lua-5.4.4/src/lua.c"; sourceTree = ""; }; - BAE8011F27B99CAC002B3786 /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = "../../lib/lua-5.4.4/src/ldo.c"; sourceTree = ""; }; - BAE8012027B99CAC002B3786 /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = "../../lib/lua-5.4.4/src/ldump.c"; sourceTree = ""; }; - BAE8012127B99CAC002B3786 /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = "../../lib/lua-5.4.4/src/lparser.c"; sourceTree = ""; }; - BAE8012227B99CAC002B3786 /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = "../../lib/lua-5.4.4/src/lstate.c"; sourceTree = ""; }; - BAE8012327B99CAC002B3786 /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = "../../lib/lua-5.4.4/src/lapi.c"; sourceTree = ""; }; - BAE8012427B99CAC002B3786 /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = "../../lib/lua-5.4.4/src/ldebug.c"; sourceTree = ""; }; - BAE8012527B99CAC002B3786 /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = "../../lib/lua-5.4.4/src/lstring.c"; sourceTree = ""; }; - BAE8012627B99CAC002B3786 /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = "../../lib/lua-5.4.4/src/ltm.c"; sourceTree = ""; }; - BAE8012727B99CAC002B3786 /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = "../../lib/lua-5.4.4/src/lmem.c"; sourceTree = ""; }; - BAE8012827B99CAC002B3786 /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = "../../lib/lua-5.4.4/src/lvm.c"; sourceTree = ""; }; - BAE8012927B99CAC002B3786 /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = "../../lib/lua-5.4.4/src/lfunc.c"; sourceTree = ""; }; - BAE8012A27B99CAC002B3786 /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = "../../lib/lua-5.4.4/src/lgc.c"; sourceTree = ""; }; - BAE8012B27B99CAD002B3786 /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = "../../lib/lua-5.4.4/src/lundump.c"; sourceTree = ""; }; - BAE8012C27B99CAD002B3786 /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = "../../lib/lua-5.4.4/src/lbaselib.c"; sourceTree = ""; }; - BAE8012D27B99CAD002B3786 /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = "../../lib/lua-5.4.4/src/ldblib.c"; sourceTree = ""; }; - BAE8012E27B99CAD002B3786 /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = "../../lib/lua-5.4.4/src/lauxlib.c"; sourceTree = ""; }; - BAE8012F27B99CAD002B3786 /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = "../../lib/lua-5.4.4/src/liolib.c"; sourceTree = ""; }; - BAE8013027B99CAD002B3786 /* lctype.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lctype.c; path = "../../lib/lua-5.4.4/src/lctype.c"; sourceTree = ""; }; - BAE8013127B99CAD002B3786 /* luac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = luac.c; path = "../../lib/lua-5.4.4/src/luac.c"; sourceTree = ""; }; - BAE8013227B99CAD002B3786 /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = "../../lib/lua-5.4.4/src/loadlib.c"; sourceTree = ""; }; - BAE8013327B99CAD002B3786 /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = "../../lib/lua-5.4.4/src/lmathlib.c"; sourceTree = ""; }; - BAE8013427B99CAD002B3786 /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = "../../lib/lua-5.4.4/src/lstrlib.c"; sourceTree = ""; }; - BAE8013527B99CAD002B3786 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = "../../lib/lua-5.4.4/src/lzio.c"; sourceTree = ""; }; + BAE8011427B99CAB002B3786 /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = "../../lib/lua-5.4.6/src/lopcodes.c"; sourceTree = ""; }; + BAE8011527B99CAB002B3786 /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = "../../lib/lua-5.4.6/src/linit.c"; sourceTree = ""; }; + BAE8011627B99CAB002B3786 /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = "../../lib/lua-5.4.6/src/lobject.c"; sourceTree = ""; }; + BAE8011727B99CAC002B3786 /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = "../../lib/lua-5.4.6/src/loslib.c"; sourceTree = ""; }; + BAE8011827B99CAC002B3786 /* lcorolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcorolib.c; path = "../../lib/lua-5.4.6/src/lcorolib.c"; sourceTree = ""; }; + BAE8011927B99CAC002B3786 /* lutf8lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lutf8lib.c; path = "../../lib/lua-5.4.6/src/lutf8lib.c"; sourceTree = ""; }; + BAE8011A27B99CAC002B3786 /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = "../../lib/lua-5.4.6/src/ltable.c"; sourceTree = ""; }; + BAE8011B27B99CAC002B3786 /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = "../../lib/lua-5.4.6/src/ltablib.c"; sourceTree = ""; }; + BAE8011C27B99CAC002B3786 /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = "../../lib/lua-5.4.6/src/llex.c"; sourceTree = ""; }; + BAE8011D27B99CAC002B3786 /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = "../../lib/lua-5.4.6/src/lcode.c"; sourceTree = ""; }; + BAE8011E27B99CAC002B3786 /* lua.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lua.c; path = "../../lib/lua-5.4.6/src/lua.c"; sourceTree = ""; }; + BAE8011F27B99CAC002B3786 /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = "../../lib/lua-5.4.6/src/ldo.c"; sourceTree = ""; }; + BAE8012027B99CAC002B3786 /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = "../../lib/lua-5.4.6/src/ldump.c"; sourceTree = ""; }; + BAE8012127B99CAC002B3786 /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = "../../lib/lua-5.4.6/src/lparser.c"; sourceTree = ""; }; + BAE8012227B99CAC002B3786 /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = "../../lib/lua-5.4.6/src/lstate.c"; sourceTree = ""; }; + BAE8012327B99CAC002B3786 /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = "../../lib/lua-5.4.6/src/lapi.c"; sourceTree = ""; }; + BAE8012427B99CAC002B3786 /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = "../../lib/lua-5.4.6/src/ldebug.c"; sourceTree = ""; }; + BAE8012527B99CAC002B3786 /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = "../../lib/lua-5.4.6/src/lstring.c"; sourceTree = ""; }; + BAE8012627B99CAC002B3786 /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = "../../lib/lua-5.4.6/src/ltm.c"; sourceTree = ""; }; + BAE8012727B99CAC002B3786 /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = "../../lib/lua-5.4.6/src/lmem.c"; sourceTree = ""; }; + BAE8012827B99CAC002B3786 /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = "../../lib/lua-5.4.6/src/lvm.c"; sourceTree = ""; }; + BAE8012927B99CAC002B3786 /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = "../../lib/lua-5.4.6/src/lfunc.c"; sourceTree = ""; }; + BAE8012A27B99CAC002B3786 /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = "../../lib/lua-5.4.6/src/lgc.c"; sourceTree = ""; }; + BAE8012B27B99CAD002B3786 /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = "../../lib/lua-5.4.6/src/lundump.c"; sourceTree = ""; }; + BAE8012C27B99CAD002B3786 /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = "../../lib/lua-5.4.6/src/lbaselib.c"; sourceTree = ""; }; + BAE8012D27B99CAD002B3786 /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = "../../lib/lua-5.4.6/src/ldblib.c"; sourceTree = ""; }; + BAE8012E27B99CAD002B3786 /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = "../../lib/lua-5.4.6/src/lauxlib.c"; sourceTree = ""; }; + BAE8012F27B99CAD002B3786 /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = "../../lib/lua-5.4.6/src/liolib.c"; sourceTree = ""; }; + BAE8013027B99CAD002B3786 /* lctype.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lctype.c; path = "../../lib/lua-5.4.6/src/lctype.c"; sourceTree = ""; }; + BAE8013127B99CAD002B3786 /* luac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = luac.c; path = "../../lib/lua-5.4.6/src/luac.c"; sourceTree = ""; }; + BAE8013227B99CAD002B3786 /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = "../../lib/lua-5.4.6/src/loadlib.c"; sourceTree = ""; }; + BAE8013327B99CAD002B3786 /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = "../../lib/lua-5.4.6/src/lmathlib.c"; sourceTree = ""; }; + BAE8013427B99CAD002B3786 /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = "../../lib/lua-5.4.6/src/lstrlib.c"; sourceTree = ""; }; + BAE8013527B99CAD002B3786 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = "../../lib/lua-5.4.6/src/lzio.c"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1882,7 +1882,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include"; - LUA_VERSION = 5.4.4; + LUA_VERSION = 5.4.6; MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1965,7 +1965,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include"; - LUA_VERSION = 5.4.4; + LUA_VERSION = 5.4.6; MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; diff --git a/sys/windows/Install.windows b/sys/windows/Install.windows index bde546a30..d78c79258 100644 --- a/sys/windows/Install.windows +++ b/sys/windows/Install.windows @@ -96,8 +96,8 @@ Via zip download o obtain Lua cd lib - wget http://www.lua.org/ftp/lua-5.4.4.tar.gz - tar -xvf lua-5.4.4.tar.gz + wget http://www.lua.org/ftp/lua-5.4.6.tar.gz + tar -xvf lua-5.4.6.tar.gz cd .. o obtain pdcurses @@ -120,7 +120,7 @@ Via zip download change from LUATOP = ../submodules/lua to - LUATOP = ../lib/lua-5.4.4 + LUATOP = ../lib/lua-5.4.6 In sys/windows/Makefile.nmake change from @@ -131,7 +131,7 @@ Via zip download change from LUATOP = ..\submodules\lua to - LUATOP = ..\lib\lua-5.4.4 + LUATOP = ..\lib\lua-5.4.6 /-----------------------------------------------------------\ | Building And Running Using Visual Studio 2017, 2019, 2022 | diff --git a/sys/windows/Makefile.mingw32 b/sys/windows/Makefile.mingw32 index c2de9f5dd..cd047368c 100644 --- a/sys/windows/Makefile.mingw32 +++ b/sys/windows/Makefile.mingw32 @@ -96,7 +96,7 @@ USE_LUADLL = Y WANT_LUAC = N ifndef LUA_VERSION -LUAVER=5.4.4 +LUAVER=5.4.6 else LUAVER=$(LUA_VERSION) endif @@ -350,7 +350,7 @@ CLEAN_DIR = $(GAMEDIR) $(OBJ) #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz #================================================================= OLUA = $(O)lua @@ -755,8 +755,8 @@ fetchpdcurses: git submodule init ../submodules/pdcurses && \ git submodule update --remote ../submodules/pdcurses ; fi else # GIT_AVAILABLE no -CURLLUASRC=http://www.lua.org/ftp/lua-5.4.4.tar.gz -CURLLUADST=lua-5.4.4.tar.gz +CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz +CURLLUADST=lua-5.4.6.tar.gz CURLPDCSRC=https://github.com/wmcbrine/PDCurses/archive/refs/tags/3.9.zip CURLPDCDST=pdcurses.zip diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake index f7d1cc024..e6a3ce3a4 100644 --- a/sys/windows/Makefile.nmake +++ b/sys/windows/Makefile.nmake @@ -109,7 +109,7 @@ Q=@ SKIP_NETHACKW = N !IFNDEF LUA_VERSION -LUAVER=5.4.4 +LUAVER=5.4.6 !ELSE LUAVER=$(LUA_VERSION) !ENDIF @@ -354,7 +354,7 @@ GITBRANCH = -DNETHACK_GIT_BRANCH=\"$(GIT_BRANCH)\" #===============-================================================= # LUA library -# Official source for Lua is http://www.lua.org/ftp/lua-5.4.4.tar.gz +# Official source for Lua is http://www.lua.org/ftp/lua-5.4.6.tar.gz # # Source for the NetHack repository submodule in ../submodules/lua # is https://github.com/lua/lua.git @@ -363,7 +363,7 @@ GITBRANCH = -DNETHACK_GIT_BRANCH=\"$(GIT_BRANCH)\" # Location of LUA # # Original source needs to be obtained from: -# http://www.lua.org/ftp/lua-5.4.4.tar.gz +# http://www.lua.org/ftp/lua-5.4.6.tar.gz # # This build assumes that the LUA sources are located # at the specified location. If they are actually elsewhere @@ -373,7 +373,7 @@ GITBRANCH = -DNETHACK_GIT_BRANCH=\"$(GIT_BRANCH)\" # !IFNDEF LUAVER -LUAVER=5.4.4 +LUAVER=5.4.6 !ENDIF LUALIB = $(LIBDIR)\lua$(LUAVER)-$(TARGET_CPU)-static.lib @@ -1321,8 +1321,8 @@ $(PDCURSES_TOP)\curses.h: git submodule update --remote ../submodules/$(PDCDIST) !ELSE # GIT_AVAILABLE no -CURLLUASRC=http://www.lua.org/ftp/lua-5.4.4.tar.gz -CURLLUADST=lua-5.4.4.tar.gz +CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz +CURLLUADST=lua-5.4.6.tar.gz #CURLPDCSRC=https://github.com/wmcbrine/PDCurses/archive/refs/tags/3.9.zip CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.3.5.zip diff --git a/sys/windows/vs/NetHackProperties.props b/sys/windows/vs/NetHackProperties.props index 451aabf4b..e7fe18736 100644 --- a/sys/windows/vs/NetHackProperties.props +++ b/sys/windows/vs/NetHackProperties.props @@ -7,7 +7,7 @@ 0 5 4 - 4> + 6> $(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL) true