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

8
sys/windows/GNUmakefile
View File

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

14
sys/windows/Makefile.nmake
View File

@@ -142,7 +142,7 @@ Q=@
SKIP_NETHACKW = N
!IFNDEF LUA_VERSION
LUAVER=5.4.6
LUAVER=5.4.8
!ELSE
LUAVER=$(LUA_VERSION)
!ENDIF
@@ -534,9 +534,9 @@ GITBRANCH = -DNETHACK_GIT_BRANCH=\"$(GIT_BRANCH)\"
GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\"
!ENDIF
#===============-=================================================
#=================================================================
# 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
# is https://github.com/lua/lua.git
@@ -545,7 +545,7 @@ GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\"
# Location of LUA
#
# 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
# at the specified location. If they are actually elsewhere
@@ -555,7 +555,7 @@ GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\"
#
!IFNDEF LUAVER
LUAVER=5.4.6
LUAVER=5.4.8
!ENDIF
LUALIB = $(LIBDIR)lua$(LUAVER)-$(TARGET_CPU)-static.lib
@@ -1603,8 +1603,8 @@ $(PDCURSES_TOP)curses.h:
# git submodule update --remote $(SUBM)$(R_PDCDIST)
!ENDIF
!ELSE # GIT_AVAILABLE no
CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz
CURLLUADST=lua-5.4.6.tar.gz
CURLLUASRC=http://www.lua.org/ftp/lua-5.4.8.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/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
|

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
|

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
|

2
sys/windows/fetch.cmd
View File

@@ -2,7 +2,7 @@
if not exist lib\* mkdir lib
if [%1] == [lua] (
set LUA_VERSION=5.4.6
set LUA_VERSION=5.4.8
set LUASRC=../lib/lua
set CURLLUASRC=http://www.lua.org/ftp/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 [ -z "$LUA_VERSION" ]; then
export LUA_VERSION=5.4.6
export LUA_VERSION=5.4.8
export LUASRC=../lib/lua
fi
export CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz
export CURLLUADST=lua-5.4.6.tar.gz
export CURLLUASRC=http://www.lua.org/ftp/lua-5.4.8.tar.gz
export CURLLUADST=lua-5.4.8.tar.gz
if [ ! -f lib/lua.h ] ;then
cd lib

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

@@ -9,7 +9,7 @@ NHV=$(NETHACK_VERSION:.=)
NHV=$(NHV:"=)
# 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
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>
<LUA_MAJOR_VERSION>5</LUA_MAJOR_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>
<FMODROOT>$(ROOTDIR)lib\fmod\api\core\</FMODROOT>
<FMODLIBBASENAME>fmod_vc.lib</FMODLIBBASENAME>

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

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