nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

bump Lua references from 5.4.6 to 5.4.8

Browse Source
This commit is contained in:
nhmall
2026-01-04 11:12:50 -05:00
parent aec4504337
commit 642cf9a93e
29 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cross-compiling
View File

@@ -413,7 +413,7 @@ Using the cross-compiler, build the following targets:
b) Lua (mandatory in 3.7) b) Lua (mandatory in 3.7)
lib/lua-5.4.6/src lib/lua-5.4.8/src
from sources: lua.c, lapi.c, lauxlib.c, lbaselib.c, lcode.c, from sources: lua.c, lapi.c, lauxlib.c, lbaselib.c, lcode.c,
lcorolib.c, lctype.c, ldblib.c, ldebug.c, lcorolib.c, lctype.c, ldblib.c, ldebug.c,

2
Porting
View File

@@ -201,7 +201,7 @@ need to be included in the packaging of the game.
4.3. Lua 4.3. Lua
Compile and link into a library, or obtain a prebuilt Lua library for Compile and link into a library, or obtain a prebuilt Lua library for
your platform. Place the Lua source into lib/lua-5.4.6 (or other folder your platform. Place the Lua source into lib/lua-5.4.8 (or other folder
representing an appropriate Lua version); place the compiled Lua library into representing an appropriate Lua version); place the compiled Lua library into
lib. lib.

4
azure-pipelines.yml
View File

@@ -129,7 +129,7 @@ steps:
export LUASRC=../submodules/lua export LUASRC=../submodules/lua
export ADD_CURSES=Y export ADD_CURSES=Y
export PDCURSES_TOP=../submodules/pdcursesmod export PDCURSES_TOP=../submodules/pdcursesmod
export LUA_VERSION=5.4.6 export LUA_VERSION=5.4.8
# #
# 64-bit # 64-bit
#export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0posix-19.1.1-12.0.0-ucrt-r2/winlibs-x86_64-posix-seh-gcc-14.2.0-llvm-19.1.1-mingw-w64ucrt-12.0.0-r2.zip #export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0posix-19.1.1-12.0.0-ucrt-r2/winlibs-x86_64-posix-seh-gcc-14.2.0-llvm-19.1.1-mingw-w64ucrt-12.0.0-r2.zip
@@ -235,7 +235,7 @@ steps:
sys/msdos/fetch-cross-compiler.sh sys/msdos/fetch-cross-compiler.sh
retVal=$? retVal=$?
if [ $retVal -eq 0 ]; then if [ $retVal -eq 0 ]; then
make LUA_VERSION=5.4.6 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 $IN_CI package make LUA_VERSION=5.4.8 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 $IN_CI package
fi fi
condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross')) condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross'))
workingDirectory: $(Agent.BuildDirectory)/$(netHackPath) workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)

16
outdated/.travis.yml
View File

@@ -3,7 +3,7 @@ matrix:
include: include:
- name: linux-xenial-gcc-win-all - name: linux-xenial-gcc-win-all
os: linux os: linux
env: HINTS=linux.370 LUA_VERSION=5.4.6 env: HINTS=linux.370 LUA_VERSION=5.4.8
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
@@ -21,7 +21,7 @@ matrix:
- make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
- name: linux-bionic-gcc-win-all - name: linux-bionic-gcc-win-all
os: linux os: linux
env: HINTS=linux.370 LUA_VERSION=5.4.6 env: HINTS=linux.370 LUA_VERSION=5.4.8
dist: bionic dist: bionic
compiler: gcc compiler: gcc
addons: addons:
@@ -40,7 +40,7 @@ matrix:
- make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
- name: linux-focal-clang-win-all - name: linux-focal-clang-win-all
os: linux os: linux
env: HINTS=linux.370 LUA_VERSION=5.4.6 env: HINTS=linux.370 LUA_VERSION=5.4.8
dist: focal dist: focal
compiler: clang compiler: clang
addons: addons:
@@ -59,7 +59,7 @@ matrix:
- make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
- name: linux-xenial-gcc-nocommon - name: linux-xenial-gcc-nocommon
os: linux os: linux
env: HINTS=linux.370 LUA_VERSION=5.4.6 env: HINTS=linux.370 LUA_VERSION=5.4.8
dist: xenial dist: xenial
compiler: gcc compiler: gcc
script: script:
@@ -70,7 +70,7 @@ matrix:
- make install - make install
- name: linux-focal-gcc9-win-all - name: linux-focal-gcc9-win-all
os: linux os: linux
env: HINTS=linux.370 LUA_VERSION=5.4.6 env: HINTS=linux.370 LUA_VERSION=5.4.8
dist: focal dist: focal
compiler: gcc compiler: gcc
addons: addons:
@@ -91,7 +91,7 @@ matrix:
- make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
- name: linux-xenial-gcc-minimal - name: linux-xenial-gcc-minimal
os: linux os: linux
env: HINTS=linux-minimal LUA_VERSION=5.4.6 env: HINTS=linux-minimal LUA_VERSION=5.4.8
compiler: gcc compiler: gcc
script: | script: |
cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
@@ -128,7 +128,7 @@ matrix:
script: script:
- export ADD_CURSES=Y - export ADD_CURSES=Y
- export PDCURSES_TOP=../lib/pdcurses - export PDCURSES_TOP=../lib/pdcurses
- export LUA_VERSION=5.4.6 - export LUA_VERSION=5.4.8
- sh sys/windows/travis-gcc.sh - sh sys/windows/travis-gcc.sh
- test -d "lib/lua-$LUA_VERSION/src" || exit 0 - test -d "lib/lua-$LUA_VERSION/src" || exit 0
- test -d "lib/pdcurses" || exit 0 - test -d "lib/pdcurses" || exit 0
@@ -137,7 +137,7 @@ matrix:
- mingw32-make LUA_VERSION=$LUA_VERSION install - mingw32-make LUA_VERSION=$LUA_VERSION install
- name: msdos-linux-focal-djgpp-crosscompile - name: msdos-linux-focal-djgpp-crosscompile
os: linux os: linux
env: HINTS=linux.370 LUA_VERSION=5.4.6 env: HINTS=linux.370 LUA_VERSION=5.4.8
dist: focal dist: focal
compiler: gcc compiler: gcc
script: script:

4
outdated/sys/unix/hints/include/cross-amiga-pre
View File

@@ -24,9 +24,9 @@ endif
ifdef BUILD_TARGET_LUA ifdef BUILD_TARGET_LUA
#===============-================================================= #===============-=================================================
# LUA library # LUA library
# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz
#================================================================= #=================================================================
LUA_VERSION ?=5.4.6 LUA_VERSION ?=5.4.8
LUATOP ?= ../lib/lua-$(LUA_VERSION) LUATOP ?= ../lib/lua-$(LUA_VERSION)
LUASRCDIR ?= $(LUATOP)/src LUASRCDIR ?= $(LUATOP)/src
LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \ LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \

4
outdated/sys/windows/travis-gcc.sh
View File

@@ -3,6 +3,6 @@ mkdir -p lib
cd lib cd lib
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses
#git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags #git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags
curl -R -O http://www.lua.org/ftp/lua-5.4.6.tar.gz curl -R -O http://www.lua.org/ftp/lua-5.4.8.tar.gz
tar zxf lua-5.4.6.tar.gz tar zxf lua-5.4.8.tar.gz
cd ../ cd ../

4
sys/msdos/Install.dos
View File

@@ -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: a DOS-extender (for including in msdos packaging) from:
http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip
and Lua from: and Lua from:
http://www.lua.org/ftp/lua-5.4.6.tar.gz http://www.lua.org/ftp/lua-5.4.8.tar.gz
If you want the DOSVGA build, to support higher resolutions and Unicode If you want the DOSVGA build, to support higher resolutions and Unicode
symbols, you also need: symbols, you also need:
@@ -123,7 +123,7 @@ Appendix B - Common Difficulties Encountered
For example: For example:
make CROSS_TO_MSDOS=1 package make CROSS_TO_MSDOS=1 package
( cd src ; make LUA_VERSION=5.4.6 nethack ) ( cd src ; make LUA_VERSION=5.4.8 nethack )
make[1]: Entering directory '/home/johndoe/NHsource/src' make[1]: Entering directory '/home/johndoe/NHsource/src'
mkdir -p ../targets/msdos ; make ../targets/msdos/exceptn.o ; mkdir -p ../targets/msdos ; make ../targets/msdos/exceptn.o ;
make[2]: Entering directory '/home/johndoe/NHsource/src' make[2]: Entering directory '/home/johndoe/NHsource/src'

4
sys/msdos/Makefile.GCC
View File

@@ -56,7 +56,7 @@ endif
# Location of LUA # Location of LUA
# #
# Original source needs to be obtained from: # Original source needs to be obtained from:
# http://www.lua.org/ftp/lua-5.4.6.tar.gz # http://www.lua.org/ftp/lua-5.4.8.tar.gz
# #
# This build assumes that the LUA sources are located # This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere # at the specified location. If they are actually elsewhere
@@ -324,7 +324,7 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ)
#===============-================================================= #===============-=================================================
# LUA library # LUA library
# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz
#================================================================= #=================================================================
LUASRC = $(LUATOP)/src LUASRC = $(LUATOP)/src

2
sys/msdos/fetch-cross-compiler.sh
View File

@@ -15,7 +15,7 @@ if [ -z "$GCCVER" ]; then
fi fi
if [ -z "$LUA_VERSION" ]; then if [ -z "$LUA_VERSION" ]; then
export LUA_VERSION=5.4.6 export LUA_VERSION=5.4.8
fi fi
if [ ! -d "$(pwd)/lib" ]; then if [ ! -d "$(pwd)/lib" ]; then

2
sys/unix/Makefile.src
View File

@@ -502,7 +502,7 @@ TARGET_HACKLIB = $(TARGETPFX)hacklib.a
MAKEDEFS = ../util/makedefs MAKEDEFS = ../util/makedefs
# -lm required by lua # -lm required by lua
LUA_VERSION ?=5.4.6 LUA_VERSION ?=5.4.8
LUABASE = liblua-$(LUA_VERSION).a LUABASE = liblua-$(LUA_VERSION).a
LUALIB = ../lib/lua/$(LUABASE) LUALIB = ../lib/lua/$(LUABASE)
LUALIBS = $(LUALIB) -lm $(DLLIB) LUALIBS = $(LUALIB) -lm $(DLLIB)

2
sys/unix/Makefile.top
View File

@@ -85,7 +85,7 @@ VARDAT = $(VARDATD) $(VARDATND)
#CHGRP = chgrp #CHGRP = chgrp
# Lua version # Lua version
LUA_VERSION = 5.4.6 LUA_VERSION = 5.4.8
# #
# end of configuration # end of configuration

72
sys/unix/NetHack.xcodeproj/project.pbxproj
View File

@@ -561,40 +561,40 @@
54FB2B4A246310A600397C0E /* symbols.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = symbols.c; path = ../../src/symbols.c; sourceTree = "<group>"; }; 54FB2B4A246310A600397C0E /* symbols.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = symbols.c; path = ../../src/symbols.c; sourceTree = "<group>"; };
54FCE8282223261F00F393C8 /* isaac64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isaac64.c; path = ../../src/isaac64.c; sourceTree = "<group>"; }; 54FCE8282223261F00F393C8 /* isaac64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isaac64.c; path = ../../src/isaac64.c; sourceTree = "<group>"; };
BAE8010A27B97760002B3786 /* libnhlua.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnhlua.a; sourceTree = BUILT_PRODUCTS_DIR; }; 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.6/src/lopcodes.c"; sourceTree = "<group>"; }; BAE8011427B99CAB002B3786 /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = "../../lib/lua-5.4.8/src/lopcodes.c"; sourceTree = "<group>"; };
BAE8011527B99CAB002B3786 /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = "../../lib/lua-5.4.6/src/linit.c"; sourceTree = "<group>"; }; BAE8011527B99CAB002B3786 /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = "../../lib/lua-5.4.8/src/linit.c"; sourceTree = "<group>"; };
BAE8011627B99CAB002B3786 /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = "../../lib/lua-5.4.6/src/lobject.c"; sourceTree = "<group>"; }; BAE8011627B99CAB002B3786 /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = "../../lib/lua-5.4.8/src/lobject.c"; sourceTree = "<group>"; };
BAE8011727B99CAC002B3786 /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = "../../lib/lua-5.4.6/src/loslib.c"; sourceTree = "<group>"; }; BAE8011727B99CAC002B3786 /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = "../../lib/lua-5.4.8/src/loslib.c"; sourceTree = "<group>"; };
BAE8011827B99CAC002B3786 /* lcorolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcorolib.c; path = "../../lib/lua-5.4.6/src/lcorolib.c"; sourceTree = "<group>"; }; BAE8011827B99CAC002B3786 /* lcorolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcorolib.c; path = "../../lib/lua-5.4.8/src/lcorolib.c"; sourceTree = "<group>"; };
BAE8011927B99CAC002B3786 /* lutf8lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lutf8lib.c; path = "../../lib/lua-5.4.6/src/lutf8lib.c"; sourceTree = "<group>"; }; BAE8011927B99CAC002B3786 /* lutf8lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lutf8lib.c; path = "../../lib/lua-5.4.8/src/lutf8lib.c"; sourceTree = "<group>"; };
BAE8011A27B99CAC002B3786 /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = "../../lib/lua-5.4.6/src/ltable.c"; sourceTree = "<group>"; }; BAE8011A27B99CAC002B3786 /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = "../../lib/lua-5.4.8/src/ltable.c"; sourceTree = "<group>"; };
BAE8011B27B99CAC002B3786 /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = "../../lib/lua-5.4.6/src/ltablib.c"; sourceTree = "<group>"; }; BAE8011B27B99CAC002B3786 /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = "../../lib/lua-5.4.8/src/ltablib.c"; sourceTree = "<group>"; };
BAE8011C27B99CAC002B3786 /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = "../../lib/lua-5.4.6/src/llex.c"; sourceTree = "<group>"; }; BAE8011C27B99CAC002B3786 /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = "../../lib/lua-5.4.8/src/llex.c"; sourceTree = "<group>"; };
BAE8011D27B99CAC002B3786 /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = "../../lib/lua-5.4.6/src/lcode.c"; sourceTree = "<group>"; }; BAE8011D27B99CAC002B3786 /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = "../../lib/lua-5.4.8/src/lcode.c"; sourceTree = "<group>"; };
BAE8011E27B99CAC002B3786 /* lua.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lua.c; path = "../../lib/lua-5.4.6/src/lua.c"; sourceTree = "<group>"; }; BAE8011E27B99CAC002B3786 /* lua.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lua.c; path = "../../lib/lua-5.4.8/src/lua.c"; sourceTree = "<group>"; };
BAE8011F27B99CAC002B3786 /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = "../../lib/lua-5.4.6/src/ldo.c"; sourceTree = "<group>"; }; BAE8011F27B99CAC002B3786 /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = "../../lib/lua-5.4.8/src/ldo.c"; sourceTree = "<group>"; };
BAE8012027B99CAC002B3786 /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = "../../lib/lua-5.4.6/src/ldump.c"; sourceTree = "<group>"; }; BAE8012027B99CAC002B3786 /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = "../../lib/lua-5.4.8/src/ldump.c"; sourceTree = "<group>"; };
BAE8012127B99CAC002B3786 /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = "../../lib/lua-5.4.6/src/lparser.c"; sourceTree = "<group>"; }; BAE8012127B99CAC002B3786 /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = "../../lib/lua-5.4.8/src/lparser.c"; sourceTree = "<group>"; };
BAE8012227B99CAC002B3786 /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = "../../lib/lua-5.4.6/src/lstate.c"; sourceTree = "<group>"; }; BAE8012227B99CAC002B3786 /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = "../../lib/lua-5.4.8/src/lstate.c"; sourceTree = "<group>"; };
BAE8012327B99CAC002B3786 /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = "../../lib/lua-5.4.6/src/lapi.c"; sourceTree = "<group>"; }; BAE8012327B99CAC002B3786 /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = "../../lib/lua-5.4.8/src/lapi.c"; sourceTree = "<group>"; };
BAE8012427B99CAC002B3786 /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = "../../lib/lua-5.4.6/src/ldebug.c"; sourceTree = "<group>"; }; BAE8012427B99CAC002B3786 /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = "../../lib/lua-5.4.8/src/ldebug.c"; sourceTree = "<group>"; };
BAE8012527B99CAC002B3786 /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = "../../lib/lua-5.4.6/src/lstring.c"; sourceTree = "<group>"; }; BAE8012527B99CAC002B3786 /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = "../../lib/lua-5.4.8/src/lstring.c"; sourceTree = "<group>"; };
BAE8012627B99CAC002B3786 /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = "../../lib/lua-5.4.6/src/ltm.c"; sourceTree = "<group>"; }; BAE8012627B99CAC002B3786 /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = "../../lib/lua-5.4.8/src/ltm.c"; sourceTree = "<group>"; };
BAE8012727B99CAC002B3786 /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = "../../lib/lua-5.4.6/src/lmem.c"; sourceTree = "<group>"; }; BAE8012727B99CAC002B3786 /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = "../../lib/lua-5.4.8/src/lmem.c"; sourceTree = "<group>"; };
BAE8012827B99CAC002B3786 /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = "../../lib/lua-5.4.6/src/lvm.c"; sourceTree = "<group>"; }; BAE8012827B99CAC002B3786 /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = "../../lib/lua-5.4.8/src/lvm.c"; sourceTree = "<group>"; };
BAE8012927B99CAC002B3786 /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = "../../lib/lua-5.4.6/src/lfunc.c"; sourceTree = "<group>"; }; BAE8012927B99CAC002B3786 /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = "../../lib/lua-5.4.8/src/lfunc.c"; sourceTree = "<group>"; };
BAE8012A27B99CAC002B3786 /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = "../../lib/lua-5.4.6/src/lgc.c"; sourceTree = "<group>"; }; BAE8012A27B99CAC002B3786 /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = "../../lib/lua-5.4.8/src/lgc.c"; sourceTree = "<group>"; };
BAE8012B27B99CAD002B3786 /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = "../../lib/lua-5.4.6/src/lundump.c"; sourceTree = "<group>"; }; BAE8012B27B99CAD002B3786 /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = "../../lib/lua-5.4.8/src/lundump.c"; sourceTree = "<group>"; };
BAE8012C27B99CAD002B3786 /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = "../../lib/lua-5.4.6/src/lbaselib.c"; sourceTree = "<group>"; }; BAE8012C27B99CAD002B3786 /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = "../../lib/lua-5.4.8/src/lbaselib.c"; sourceTree = "<group>"; };
BAE8012D27B99CAD002B3786 /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = "../../lib/lua-5.4.6/src/ldblib.c"; sourceTree = "<group>"; }; BAE8012D27B99CAD002B3786 /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = "../../lib/lua-5.4.8/src/ldblib.c"; sourceTree = "<group>"; };
BAE8012E27B99CAD002B3786 /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = "../../lib/lua-5.4.6/src/lauxlib.c"; sourceTree = "<group>"; }; BAE8012E27B99CAD002B3786 /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = "../../lib/lua-5.4.8/src/lauxlib.c"; sourceTree = "<group>"; };
BAE8012F27B99CAD002B3786 /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = "../../lib/lua-5.4.6/src/liolib.c"; sourceTree = "<group>"; }; BAE8012F27B99CAD002B3786 /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = "../../lib/lua-5.4.8/src/liolib.c"; sourceTree = "<group>"; };
BAE8013027B99CAD002B3786 /* lctype.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lctype.c; path = "../../lib/lua-5.4.6/src/lctype.c"; sourceTree = "<group>"; }; BAE8013027B99CAD002B3786 /* lctype.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lctype.c; path = "../../lib/lua-5.4.8/src/lctype.c"; sourceTree = "<group>"; };
BAE8013127B99CAD002B3786 /* luac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = luac.c; path = "../../lib/lua-5.4.6/src/luac.c"; sourceTree = "<group>"; }; BAE8013127B99CAD002B3786 /* luac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = luac.c; path = "../../lib/lua-5.4.8/src/luac.c"; sourceTree = "<group>"; };
BAE8013227B99CAD002B3786 /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = "../../lib/lua-5.4.6/src/loadlib.c"; sourceTree = "<group>"; }; BAE8013227B99CAD002B3786 /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = "../../lib/lua-5.4.8/src/loadlib.c"; sourceTree = "<group>"; };
BAE8013327B99CAD002B3786 /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = "../../lib/lua-5.4.6/src/lmathlib.c"; sourceTree = "<group>"; }; BAE8013327B99CAD002B3786 /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = "../../lib/lua-5.4.8/src/lmathlib.c"; sourceTree = "<group>"; };
BAE8013427B99CAD002B3786 /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = "../../lib/lua-5.4.6/src/lstrlib.c"; sourceTree = "<group>"; }; BAE8013427B99CAD002B3786 /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = "../../lib/lua-5.4.8/src/lstrlib.c"; sourceTree = "<group>"; };
BAE8013527B99CAD002B3786 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = "../../lib/lua-5.4.6/src/lzio.c"; sourceTree = "<group>"; }; BAE8013527B99CAD002B3786 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = "../../lib/lua-5.4.8/src/lzio.c"; sourceTree = "<group>"; };
F515A6F32DED074D006E1F63 /* sfctool.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = sfctool.c; path = ../../util/sfctool.c; sourceTree = "<group>"; }; F515A6F32DED074D006E1F63 /* sfctool.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = sfctool.c; path = ../../util/sfctool.c; sourceTree = "<group>"; };
F515A6F52DED0916006E1F63 /* date.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = date.c; path = ../../src/date.c; sourceTree = "<group>"; }; F515A6F52DED0916006E1F63 /* date.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = date.c; path = ../../src/date.c; sourceTree = "<group>"; };
F515A6F62DED0916006E1F63 /* sfbase.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = sfbase.c; path = ../../src/sfbase.c; sourceTree = "<group>"; }; F515A6F62DED0916006E1F63 /* sfbase.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = sfbase.c; path = ../../src/sfbase.c; sourceTree = "<group>"; };
@@ -2189,7 +2189,7 @@
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include"; HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include";
LUA_VERSION = 5.4.6; LUA_VERSION = 5.4.8;
MACOSX_DEPLOYMENT_TARGET = 10.14; MACOSX_DEPLOYMENT_TARGET = 10.14;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
@@ -2272,7 +2272,7 @@
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include"; HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include";
LUA_VERSION = 5.4.6; LUA_VERSION = 5.4.8;
MACOSX_DEPLOYMENT_TARGET = 10.14; MACOSX_DEPLOYMENT_TARGET = 10.14;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;

6
sys/unix/hints/include/cross-pre2.370
View File

@@ -7,9 +7,9 @@
ifdef BUILD_TARGET_LUA ifdef BUILD_TARGET_LUA
#===============-================================================= #===============-=================================================
# LUA library # LUA library
# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz
#================================================================= #=================================================================
LUA_VERSION ?=5.4.6 LUA_VERSION ?=5.4.8
LUATOP ?= ../lib/lua-$(LUA_VERSION) LUATOP ?= ../lib/lua-$(LUA_VERSION)
LUASRCDIR ?= $(LUATOP)/src LUASRCDIR ?= $(LUATOP)/src
LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \ LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \
@@ -119,7 +119,7 @@ ifdef CROSS_TO_MSDOS
# 2. Then # 2. Then
# make CROSS_TO_MSDOS=1 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 all # make CROSS_TO_MSDOS=1 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 all
# #
# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz
#================================================================= #=================================================================
CFLAGS += -DCROSSCOMPILE CFLAGS += -DCROSSCOMPILE

4
sys/vms/Makefile_dat.vms
View File

@@ -25,8 +25,8 @@ WINCHAIN=[-.win.chain]
# Lua location relative to src # Lua location relative to src
LUAVER=546 LUAVER=546
LUADOTVER=5.4.6 LUADOTVER=5.4.8
LUAUNDERVER=5_4_6 LUAUNDERVER=5_4_8
LUAINC=[-.lib.lua.lua$(LUAVER).src] LUAINC=[-.lib.lua.lua$(LUAVER).src]
LUALIB=[-.lib.lua]lua$(LUAVER).olb LUALIB=[-.lib.lua]lua$(LUAVER).olb
LUASRCDIR =[-.lib.lua.lua$(LUAVER).src] LUASRCDIR =[-.lib.lua.lua$(LUAVER).src]

4
sys/vms/Makefile_doc.vms
View File

@@ -26,8 +26,8 @@ WINCHAIN=[-.win.chain]
# Lua location relative to src # Lua location relative to src
LUAVER=546 LUAVER=546
LUADOTVER=5.4.6 LUADOTVER=5.4.8
LUAUNDERVER=5_4_6 LUAUNDERVER=5_4_8
LUAINC=[-.lib.lua.lua$(LUAVER).src] LUAINC=[-.lib.lua.lua$(LUAVER).src]
LUALIB=[-.lib.lua]lua$(LUAVER).olb LUALIB=[-.lib.lua]lua$(LUAVER).olb
LUASRCDIR =[-.lib.lua.lua$(LUAVER).src] LUASRCDIR =[-.lib.lua.lua$(LUAVER).src]

4
sys/vms/Makefile_src.vms
View File

@@ -36,8 +36,8 @@ WINCHAIN=[-.win.chain]
# Lua # Lua
LUAVER=546 LUAVER=546
LUADOTVER=5.4.6 LUADOTVER=5.4.8
LUAUNDERVER=5_4_6 LUAUNDERVER=5_4_8
# Lua location relative to src # Lua location relative to src
LUAINC=[-.lib.lua.lua$(LUAVER).src] LUAINC=[-.lib.lua.lua$(LUAVER).src]
LUALIB=[-.lib.lua]lua$(LUAVER).olb LUALIB=[-.lib.lua]lua$(LUAVER).olb

4
sys/vms/Makefile_top.vms
View File

@@ -55,8 +55,8 @@ WINCHAIN=[.win.chain]
# Lua macros # Lua macros
LUAVER=546 LUAVER=546
LUADOTVER=5.4.6 LUADOTVER=5.4.8
LUAUNDERVER=5_4_6 LUAUNDERVER=5_4_8
LUAINC=[.lib.lua.lua$(LUAVER).src] LUAINC=[.lib.lua.lua$(LUAVER).src]
LUALIB=[.lib.lua]lua$(LUAVER).olb LUALIB=[.lib.lua]lua$(LUAVER).olb
LUASRCDIR =[.lib.lua.lua$(LUAVER).src] LUASRCDIR =[.lib.lua.lua$(LUAVER).src]

4
sys/vms/Makefile_utl.vms
View File

@@ -31,8 +31,8 @@ WINCHAIN=[-.win.chain]
# Lua location relative to here # Lua location relative to here
LUAVER=546 LUAVER=546
LUADOTVER=5.4.6 LUADOTVER=5.4.8
LUAUNDERVER=5_4_6 LUAUNDERVER=5_4_8
LUAINC=[-.lib.lua.lua$(LUAVER).src] LUAINC=[-.lib.lua.lua$(LUAVER).src]
LUALIB=[-.lib.lua]lua$(LUAVER).olb LUALIB=[-.lib.lua]lua$(LUAVER).olb
LUASRCDIR =[-.lib.lua.lua$(LUAVER).src] LUASRCDIR =[-.lib.lua.lua$(LUAVER).src]

6
sys/vms/vmsbuild.com
View File

@@ -28,9 +28,9 @@ $ ! one, use "" in the earlier one's position, such as
$ ! $ @[-.sys.vms]vmsbuild "" "" "" "" "TTY+CURSES" $ ! $ @[-.sys.vms]vmsbuild "" "" "" "" "TTY+CURSES"
$ ! $ !
$ ! Lua Version $ ! Lua Version
$ luaver = "546" $ luaver = "548"
$ luadotver = "5.4.6" $ luadotver = "5.4.8"
$ luaunderver = "5_4_6" $ luaunderver = "5_4_8"
$ $
$ decc_dflt = f$trnlnm("DECC$CC_DEFAULT") $ decc_dflt = f$trnlnm("DECC$CC_DEFAULT")
$ j = (decc_dflt.nes."") .and. 1 $ j = (decc_dflt.nes."") .and. 1

8
sys/windows/GNUmakefile
View File

@@ -104,7 +104,7 @@ USE_LUADLL = Y
WANT_LUAC = N WANT_LUAC = N
ifndef LUA_VERSION ifndef LUA_VERSION
LUAVER=5.4.6 LUAVER=5.4.8
else else
LUAVER=$(LUA_VERSION) LUAVER=$(LUA_VERSION)
endif endif
@@ -393,7 +393,7 @@ CLEAN_DIR = $(GAMEDIR) $(OBJ)
#================================================================= #=================================================================
# LUA library # LUA library
# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz
#================================================================= #=================================================================
OLUA = $(O)lua OLUA = $(O)lua
@@ -1065,8 +1065,8 @@ fetchpdcurses:
git submodule update ../submodules/$(PDCURSES) ; fi git submodule update ../submodules/$(PDCURSES) ; fi
# git submodule update --remote ../submodules/$(PDCURSES) ; fi # git submodule update --remote ../submodules/$(PDCURSES) ; fi
else # GIT_AVAILABLE no else # GIT_AVAILABLE no
CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz CURLLUASRC=http://www.lua.org/ftp/lua-5.4.8.tar.gz
CURLLUADST=lua-5.4.6.tar.gz CURLLUADST=lua-5.4.8.tar.gz
CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.5.1.zip CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.5.1.zip
CURLPDCDST=$(PDCURSES).zip CURLPDCDST=$(PDCURSES).zip

14
sys/windows/Makefile.nmake
View File

@@ -142,7 +142,7 @@ Q=@
SKIP_NETHACKW = N SKIP_NETHACKW = N
!IFNDEF LUA_VERSION !IFNDEF LUA_VERSION
LUAVER=5.4.6 LUAVER=5.4.8
!ELSE !ELSE
LUAVER=$(LUA_VERSION) LUAVER=$(LUA_VERSION)
!ENDIF !ENDIF
@@ -534,9 +534,9 @@ GITBRANCH = -DNETHACK_GIT_BRANCH=\"$(GIT_BRANCH)\"
GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\" GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\"
!ENDIF !ENDIF
#===============-================================================= #=================================================================
# LUA library # LUA library
# Official source for Lua is http://www.lua.org/ftp/lua-5.4.6.tar.gz # Official source for Lua is http://www.lua.org/ftp/lua-5.4.8.tar.gz
# #
# Source for the NetHack repository submodule in ../submodules/lua # Source for the NetHack repository submodule in ../submodules/lua
# is https://github.com/lua/lua.git # is https://github.com/lua/lua.git
@@ -545,7 +545,7 @@ GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\"
# Location of LUA # Location of LUA
# #
# Original source needs to be obtained from: # Original source needs to be obtained from:
# http://www.lua.org/ftp/lua-5.4.6.tar.gz # http://www.lua.org/ftp/lua-5.4.8.tar.gz
# #
# This build assumes that the LUA sources are located # This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere # at the specified location. If they are actually elsewhere
@@ -555,7 +555,7 @@ GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\"
# #
!IFNDEF LUAVER !IFNDEF LUAVER
LUAVER=5.4.6 LUAVER=5.4.8
!ENDIF !ENDIF
LUALIB = $(LIBDIR)lua$(LUAVER)-$(TARGET_CPU)-static.lib LUALIB = $(LIBDIR)lua$(LUAVER)-$(TARGET_CPU)-static.lib
@@ -1603,8 +1603,8 @@ $(PDCURSES_TOP)curses.h:
# git submodule update --remote $(SUBM)$(R_PDCDIST) # git submodule update --remote $(SUBM)$(R_PDCDIST)
!ENDIF !ENDIF
!ELSE # GIT_AVAILABLE no !ELSE # GIT_AVAILABLE no
CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz CURLLUASRC=http://www.lua.org/ftp/lua-5.4.8.tar.gz
CURLLUADST=lua-5.4.6.tar.gz CURLLUADST=lua-5.4.8.tar.gz
#CURLPDCSRC=https://github.com/wmcbrine/PDCurses/archive/refs/tags/3.9.zip #CURLPDCSRC=https://github.com/wmcbrine/PDCurses/archive/refs/tags/3.9.zip
CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.4.0.zip CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.4.0.zip

2
sys/windows/build-msys2.txt
View File

@@ -30,7 +30,7 @@ Prerequisite Requirements:
+----------+ +------+ +----+ +----+ +----------+ +------+ +----+ +----+
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
lua-5.4.6 pdcursesmod share windows tty win32 lua pdcursesmod lua-5.4.8 pdcursesmod share windows tty win32 lua pdcursesmod
| |
vs vs
| |

2
sys/windows/build-nmake.txt
View File

@@ -43,7 +43,7 @@ You can use one of the following build environments:
+----------+ +------+ +----+ +----+ +----------+ +------+ +----+ +----+
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
lua-5.4.6 pdcursesmod share windows tty win32 lua pdcursesmod lua-5.4.8 pdcursesmod share windows tty win32 lua pdcursesmod
| |
vs vs
| |

2
sys/windows/build-vs.txt
View File

@@ -68,7 +68,7 @@ versions:
+----------+ +------+ +----+ +----+ +----------+ +------+ +----+ +----+
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
lua-5.4.6 pdcursesmod share windows tty win32 lua pdcursesmod lua-5.4.8 pdcursesmod share windows tty win32 lua pdcursesmod
| |
vs vs
| |

2
sys/windows/fetch.cmd
View File

@@ -2,7 +2,7 @@
if not exist lib\* mkdir lib if not exist lib\* mkdir lib
if [%1] == [lua] ( if [%1] == [lua] (
set LUA_VERSION=5.4.6 set LUA_VERSION=5.4.8
set LUASRC=../lib/lua set LUASRC=../lib/lua
set CURLLUASRC=http://www.lua.org/ftp/lua-%LUA_VERSION%.tar.gz set CURLLUASRC=http://www.lua.org/ftp/lua-%LUA_VERSION%.tar.gz
set CURLLUADST=lua-%LUA_VERSION%.tar.gz set CURLLUADST=lua-%LUA_VERSION%.tar.gz

6
sys/windows/fetch.sh
View File

@@ -6,12 +6,12 @@ fi
if [ $1 == "lua" ]; then if [ $1 == "lua" ]; then
if [ -z "$LUA_VERSION" ]; then if [ -z "$LUA_VERSION" ]; then
export LUA_VERSION=5.4.6 export LUA_VERSION=5.4.8
export LUASRC=../lib/lua export LUASRC=../lib/lua
fi fi
export CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz export CURLLUASRC=http://www.lua.org/ftp/lua-5.4.8.tar.gz
export CURLLUADST=lua-5.4.6.tar.gz export CURLLUADST=lua-5.4.8.tar.gz
if [ ! -f lib/lua.h ] ;then if [ ! -f lib/lua.h ] ;then
cd lib cd lib

2
sys/windows/vs/FetchPrereq/fetchprereq.nmake
View File

@@ -9,7 +9,7 @@ NHV=$(NETHACK_VERSION:.=)
NHV=$(NHV:"=) NHV=$(NHV:"=)
# The version of Lua we want # The version of Lua we want
LUA_VERSION=5.4.6 LUA_VERSION=5.4.8
CURLLUASRC=https://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz CURLLUASRC=https://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz
CURLLUADST=lua-$(LUA_VERSION).tar.gz CURLLUADST=lua-$(LUA_VERSION).tar.gz

2
sys/windows/vs/NetHackProperties.props
View File

@@ -8,7 +8,7 @@
<NETHACK_VERSION>$(VERSION_MAJOR).$(VERSION_MINOR).$(PATCHLEVEL)</NETHACK_VERSION> <NETHACK_VERSION>$(VERSION_MAJOR).$(VERSION_MINOR).$(PATCHLEVEL)</NETHACK_VERSION>
<LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION> <LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION>
<LUA_MINOR_VERSION>4</LUA_MINOR_VERSION> <LUA_MINOR_VERSION>4</LUA_MINOR_VERSION>
<LUA_PATCH_LEVEL>6></LUA_PATCH_LEVEL> <LUA_PATCH_LEVEL>8></LUA_PATCH_LEVEL>
<LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION> <LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION>
<FMODROOT>$(ROOTDIR)lib\fmod\api\core\</FMODROOT> <FMODROOT>$(ROOTDIR)lib\fmod\api\core\</FMODROOT>
<FMODLIBBASENAME>fmod_vc.lib</FMODLIBBASENAME> <FMODLIBBASENAME>fmod_vc.lib</FMODLIBBASENAME>

2
sys/windows/vs/dirs.props
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LUA_VERSION>5.4.6</LUA_VERSION> <LUA_VERSION>5.4.8</LUA_VERSION>
<RootDir>$(MSBuildProjectDirectory)\..\..\..\..\</RootDir> <RootDir>$(MSBuildProjectDirectory)\..\..\..\..\</RootDir>
<BinDir>$(RootDir)binary\$(Configuration)\$(Platform)\</BinDir> <BinDir>$(RootDir)binary\$(Configuration)\$(Platform)\</BinDir>
<ObjDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(TargetName)\</ObjDir> <ObjDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(TargetName)\</ObjDir>