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

update Lua version supported

Browse Source
This commit is contained in:
nhmall
2023-05-28 22:58:47 -04:00
parent b48cb5bcd9
commit b35d8a34ed
16 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sys/windows/Install.windows
View File

@@ -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 |

8
sys/windows/Makefile.mingw32
View File

@@ -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

12
sys/windows/Makefile.nmake
View File

@@ -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

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

@@ -7,7 +7,7 @@
<PATCHLEVEL>0</PATCHLEVEL>
<LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION>
<LUA_MINOR_VERSION>4</LUA_MINOR_VERSION>
<LUA_PATCH_LEVEL>4></LUA_PATCH_LEVEL>
<LUA_PATCH_LEVEL>6></LUA_PATCH_LEVEL>
<LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION>
<ADD_PACKAGE>true</ADD_PACKAGE>
</PropertyGroup>