support for build with current Lua version 5.4.1
This may require make spotless make fetch-lua for some platforms.
This commit is contained in:
16
.travis.yml
16
.travis.yml
@@ -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.2020 LUA_VERSION=5.4.0
|
env: HINTS=linux.2020 LUA_VERSION=5.4.1
|
||||||
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.2020 LUA_VERSION=5.4.0
|
env: HINTS=linux.2020 LUA_VERSION=5.4.1
|
||||||
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.2020 LUA_VERSION=5.4.0
|
env: HINTS=linux.2020 LUA_VERSION=5.4.1
|
||||||
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.2020 LUA_VERSION=5.4.0
|
env: HINTS=linux.2020 LUA_VERSION=5.4.1
|
||||||
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.2020 LUA_VERSION=5.4.0
|
env: HINTS=linux.2020 LUA_VERSION=5.4.1
|
||||||
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.0
|
env: HINTS=linux-minimal LUA_VERSION=5.4.1
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
script: |
|
script: |
|
||||||
cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
|
cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
|
||||||
@@ -129,7 +129,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.0
|
- export LUA_VERSION=5.4.1
|
||||||
- sh sys/winnt/travis-gcc.sh
|
- sh sys/winnt/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
|
||||||
@@ -138,7 +138,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.2020 LUA_VERSION=5.4.0
|
env: HINTS=linux.2020 LUA_VERSION=5.4.1
|
||||||
dist: focal
|
dist: focal
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
script:
|
script:
|
||||||
|
|||||||
2
Porting
2
Porting
@@ -207,7 +207,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.0 (or other folder
|
your platform. Place the Lua source into lib/lua-5.4.1 (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.
|
||||||
|
|
||||||
|
|||||||
@@ -42,13 +42,13 @@ PDCURSES_TOP=../../pdcurses
|
|||||||
ifeq "$(LUA_VERSION)" "5.3.5"
|
ifeq "$(LUA_VERSION)" "5.3.5"
|
||||||
LUAVER=5.3.5
|
LUAVER=5.3.5
|
||||||
else
|
else
|
||||||
LUAVER=5.4.0
|
LUAVER=5.4.1
|
||||||
endif
|
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.0.tar.gz
|
# http://www.lua.org/ftp/lua-5.4.1.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
|
||||||
@@ -305,7 +305,7 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ)
|
|||||||
|
|
||||||
#===============-=================================================
|
#===============-=================================================
|
||||||
# LUA library
|
# LUA library
|
||||||
# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz
|
# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
|
||||||
#=================================================================
|
#=================================================================
|
||||||
|
|
||||||
LUASRC = $(LUATOP)/src
|
LUASRC = $(LUATOP)/src
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ if [ -z "$GCCVER" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$LUA_VERSION" ]; then
|
if [ -z "$LUA_VERSION" ]; then
|
||||||
export LUA_VERSION=5.4.0
|
export LUA_VERSION=5.4.1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d "$(pwd)/lib" ]; then
|
if [ ! -d "$(pwd)/lib" ]; then
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ VARDAT = $(VARDATD) $(VARDATND)
|
|||||||
#CHGRP = chgrp
|
#CHGRP = chgrp
|
||||||
|
|
||||||
# Lua version
|
# Lua version
|
||||||
LUA_VERSION = 5.4.0
|
LUA_VERSION = 5.4.1
|
||||||
|
|
||||||
#
|
#
|
||||||
# end of configuration
|
# end of configuration
|
||||||
|
|||||||
@@ -1381,7 +1381,7 @@
|
|||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ${NH_INC_DIR}\necho '/* nhlua.h - generated by Xcode script */' > nhlua.h\necho '#include \"../lib/lua-5.4.0/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < ${NH_LIB_DIR}/lua-5.4.0/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.0/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.0/src/lauxlib.h\"' >> nhlua.h\necho '/*nhlua.h*/' >> nhlua.h\n";
|
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ${NH_INC_DIR}\necho '/* nhlua.h - generated by Xcode script */' > nhlua.h\necho '#include \"../lib/lua-5.4.1/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < ${NH_LIB_DIR}/lua-5.4.1/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.1/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.1/src/lauxlib.h\"' >> nhlua.h\necho '/*nhlua.h*/' >> nhlua.h\n";
|
||||||
};
|
};
|
||||||
544768B8239954B9004B9739 /* Build Lua library */ = {
|
544768B8239954B9004B9739 /* Build Lua library */ = {
|
||||||
isa = PBXShellScriptBuildPhase;
|
isa = PBXShellScriptBuildPhase;
|
||||||
@@ -1400,7 +1400,7 @@
|
|||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ${NH_LIB_DIR}\nmkdir -p lua\ncd ${NH_LIB_DIR}/lua-5.4.0/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n";
|
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd ${NH_LIB_DIR}\nmkdir -p lua\ncd ${NH_LIB_DIR}/lua-5.4.1/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n";
|
||||||
};
|
};
|
||||||
/* End PBXShellScriptBuildPhase section */
|
/* End PBXShellScriptBuildPhase section */
|
||||||
|
|
||||||
|
|||||||
@@ -47,9 +47,9 @@ endif
|
|||||||
ifdef BUILD_TARGET_LUA
|
ifdef BUILD_TARGET_LUA
|
||||||
#===============-=================================================
|
#===============-=================================================
|
||||||
# LUA library
|
# LUA library
|
||||||
# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz
|
# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
|
||||||
#=================================================================
|
#=================================================================
|
||||||
LUA_VERSION ?=5.4.0
|
LUA_VERSION ?=5.4.1
|
||||||
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 \
|
||||||
@@ -148,7 +148,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.0.tar.gz
|
# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
|
||||||
#=================================================================
|
#=================================================================
|
||||||
|
|
||||||
CFLAGS += -DCROSSCOMPILE
|
CFLAGS += -DCROSSCOMPILE
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ HOBJ = $(FIRSTOBJ) $(SYSOBJ) $(WINOBJ) $(RANDOBJ) \
|
|||||||
|
|
||||||
LUAOBJ = nhlua.o,nhlsel.o
|
LUAOBJ = nhlua.o,nhlsel.o
|
||||||
|
|
||||||
# 5.4.0 adds header files ljumptab.h and lopnames.h and removes lbitlib.c
|
# 5.4.0 added header files ljumptab.h and lopnames.h and removes lbitlib.c
|
||||||
# so comment top two and uncomment bottom two for the previous version (5.3.5)
|
# so comment top two and uncomment bottom two for the previous version (5.3.5)
|
||||||
LUA535SRCFILES =
|
LUA535SRCFILES =
|
||||||
LUA535OBJFILES =
|
LUA535OBJFILES =
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ version. You can use one of the following build environments:
|
|||||||
| | |
|
| | |
|
||||||
+----+ +------+ +-----------+
|
+----+ +------+ +-----------+
|
||||||
| | | | | |
|
| | | | | |
|
||||||
share winnt tty win32 Lua-5.4.0 pdcurses
|
share winnt tty win32 Lua-5.4.1 pdcurses
|
||||||
|
|
|
|
||||||
vs
|
vs
|
||||||
|
|
||||||
@@ -55,11 +55,11 @@ version. You can use one of the following build environments:
|
|||||||
| Building And Running Using Visual Studio 2017 or 2019 |
|
| Building And Running Using Visual Studio 2017 or 2019 |
|
||||||
\--------------------------------------------------------/
|
\--------------------------------------------------------/
|
||||||
|
|
||||||
Before proceeding, please obtain the lua-5.4.0 sources and copy them to
|
Before proceeding, please obtain the lua-5.4.1 sources and copy them to
|
||||||
the new directory lib\lua-5.4.0\src. This source can be obtain either from
|
the new directory lib\lua-5.4.1\src. This source can be obtain either from
|
||||||
http://www.lua.org/ftp/lua-5.4.0.tar.gz or from the git hub mirror
|
http://www.lua.org/ftp/lua-5.4.1.tar.gz or from the git hub mirror
|
||||||
https://github.com/lua/lua.git using the tag 'v5.4.0'. The build expects
|
https://github.com/lua/lua.git using the tag 'v5.4.1'. The build expects
|
||||||
to find lua files such as 'lua.h' at 'lib\lua-5.4.0\src\lua.h'.
|
to find lua files such as 'lua.h' at 'lib\lua-5.4.1\src\lua.h'.
|
||||||
|
|
||||||
If you are NOT using Visual Studio 2017 or 2019 IDE, or you prefer to build
|
If you are NOT using Visual Studio 2017 or 2019 IDE, or you prefer to build
|
||||||
using a Make utility and a Makefile proceed to "Building Using Make".
|
using a Make utility and a Makefile proceed to "Building Using Make".
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ TARGET_CPU=x86
|
|||||||
#
|
#
|
||||||
#---------------------------------------------------------------
|
#---------------------------------------------------------------
|
||||||
ifndef LUA_VERSION
|
ifndef LUA_VERSION
|
||||||
LUAVER=5.4.0
|
LUAVER=5.4.1
|
||||||
else
|
else
|
||||||
LUAVER=$(LUA_VERSION)
|
LUAVER=$(LUA_VERSION)
|
||||||
endif
|
endif
|
||||||
@@ -135,7 +135,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.0.tar.gz
|
# http://www.lua.org/ftp/lua-5.4.1.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
|
||||||
@@ -416,11 +416,11 @@ OPTIONS_FILE = $(DAT)\options
|
|||||||
|
|
||||||
#===============-=================================================
|
#===============-=================================================
|
||||||
# LUA library
|
# LUA library
|
||||||
# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz
|
# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
|
||||||
#=================================================================
|
#=================================================================
|
||||||
|
|
||||||
ifndef LUAVER
|
ifndef LUAVER
|
||||||
LUAVER = 5.4.0
|
LUAVER = 5.4.1
|
||||||
endif
|
endif
|
||||||
LUASRC = $(LUATOP)/src
|
LUASRC = $(LUATOP)/src
|
||||||
LUALIB = $(O)lua-$(LUAVER).static.a
|
LUALIB = $(O)lua-$(LUAVER).static.a
|
||||||
@@ -446,7 +446,7 @@ LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \
|
|||||||
$(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \
|
$(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \
|
||||||
$(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o
|
$(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o
|
||||||
ifeq "$(LUAVER)" "5.3.5"
|
ifeq "$(LUAVER)" "5.3.5"
|
||||||
# 5.4.0 adds header files ljumptab.h and lopnames.h and removes lbitlib.c
|
# 5.4.0 added header files ljumptab.h and lopnames.h and removes lbitlib.c
|
||||||
# so we have to tack those on for the previous version (5.3.5)
|
# so we have to tack those on for the previous version (5.3.5)
|
||||||
LUASRCFILES = $(LUASRCFILES) lbitlib.c
|
LUASRCFILES = $(LUASRCFILES) lbitlib.c
|
||||||
LUAOBJFILES = $(LUAOBJFILES) lbitlib.o
|
LUAOBJFILES = $(LUAOBJFILES) lbitlib.o
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ DEBUGINFO = Y
|
|||||||
# This marks the end of the BUILD DECISIONS section.
|
# This marks the end of the BUILD DECISIONS section.
|
||||||
#==============================================================================
|
#==============================================================================
|
||||||
!IFNDEF LUA_VERSION
|
!IFNDEF LUA_VERSION
|
||||||
LUAVER=5.4.0
|
LUAVER=5.4.1
|
||||||
!ELSE
|
!ELSE
|
||||||
LUAVER=$(LUA_VERSION)
|
LUAVER=$(LUA_VERSION)
|
||||||
!ENDIF
|
!ENDIF
|
||||||
@@ -140,7 +140,7 @@ LUAVER=$(LUA_VERSION)
|
|||||||
# 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.0.tar.gz
|
# http://www.lua.org/ftp/lua-5.4.1.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
|
||||||
@@ -385,7 +385,7 @@ OPTIONS_FILE = $(DAT)\options
|
|||||||
|
|
||||||
#===============-=================================================
|
#===============-=================================================
|
||||||
# LUA library
|
# LUA library
|
||||||
# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz
|
# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
|
||||||
#=================================================================
|
#=================================================================
|
||||||
|
|
||||||
!IFNDEF LUAVER
|
!IFNDEF LUAVER
|
||||||
@@ -395,6 +395,9 @@ LUATMP = $(LUATMP:-beta=) #strip suffix if exists "-beta"
|
|||||||
!IF "$(LUATMP)" == "5.4.0"
|
!IF "$(LUATMP)" == "5.4.0"
|
||||||
LUAVER = 5.4.0
|
LUAVER = 5.4.0
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
!IF "$(LUATMP)" == "5.4.1"
|
||||||
|
LUAVER = 5.4.1
|
||||||
|
!ENDIF
|
||||||
!ELSE
|
!ELSE
|
||||||
!ERROR NetHack 3.7 requires LUA so LUATOP must be defined
|
!ERROR NetHack 3.7 requires LUA so LUATOP must be defined
|
||||||
!ENDIF
|
!ENDIF
|
||||||
@@ -405,7 +408,7 @@ LUATMP = $(LUATMP:-BETA=) #strip suffix if exists "-BETA"
|
|||||||
!IF "$(LUATMP)" == "5.3.5"
|
!IF "$(LUATMP)" == "5.3.5"
|
||||||
LUAVER = 5.3.5
|
LUAVER = 5.3.5
|
||||||
!ELSE
|
!ELSE
|
||||||
LUAVER = 5.4.0
|
LUAVER = 5.4.1
|
||||||
!ENDIF
|
!ENDIF
|
||||||
!ENDIF
|
!ENDIF
|
||||||
!ENDIF
|
!ENDIF
|
||||||
@@ -437,7 +440,7 @@ LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \
|
|||||||
LUASRCFILES = $(LUASRCFILES) lbitlib.c
|
LUASRCFILES = $(LUASRCFILES) lbitlib.c
|
||||||
LUAOBJFILES = $(LUAOBJFILES) $(O)lbitlib.o
|
LUAOBJFILES = $(LUAOBJFILES) $(O)lbitlib.o
|
||||||
!ELSE
|
!ELSE
|
||||||
# 5.4.0 adds header files ljumptab.h and lopnames.h
|
# 5.4.0 added header files ljumptab.h and lopnames.h
|
||||||
# and removes lbitlib.c
|
# and removes lbitlib.c
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
|
|||||||
@@ -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.0.tar.gz
|
curl -R -O http://www.lua.org/ftp/lua-5.4.1.tar.gz
|
||||||
tar zxf lua-5.4.0.tar.gz
|
tar zxf lua-5.4.1.tar.gz
|
||||||
cd ../
|
cd ../
|
||||||
|
|||||||
@@ -58,6 +58,7 @@
|
|||||||
<ClCompile Include="$(LuaDir)lbaselib.c" />
|
<ClCompile Include="$(LuaDir)lbaselib.c" />
|
||||||
<ClCompile Include="$(LuaDir)lbitlib.c">
|
<ClCompile Include="$(LuaDir)lbitlib.c">
|
||||||
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.1'">true</ExcludedFromBuild>
|
||||||
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="$(LuaDir)lcode.c" />
|
<ClCompile Include="$(LuaDir)lcode.c" />
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<VERSION_MAJOR>3</VERSION_MAJOR>
|
<VERSION_MAJOR>3</VERSION_MAJOR>
|
||||||
<VERSION_MINOR>7</VERSION_MINOR>
|
<VERSION_MINOR>7</VERSION_MINOR>
|
||||||
<PATCHLEVEL>0</PATCHLEVEL>
|
<PATCHLEVEL>0</PATCHLEVEL>
|
||||||
<LUA_VERSION>5.4.0</LUA_VERSION>
|
<LUA_VERSION>5.4.1</LUA_VERSION>
|
||||||
<ADD_PACKAGE>true</ADD_PACKAGE>
|
<ADD_PACKAGE>true</ADD_PACKAGE>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup />
|
<PropertyGroup />
|
||||||
|
|||||||
@@ -52,6 +52,7 @@
|
|||||||
<ClCompile Include="$(LuaDir)lbaselib.c" />
|
<ClCompile Include="$(LuaDir)lbaselib.c" />
|
||||||
<ClCompile Include="$(LuaDir)lbitlib.c">
|
<ClCompile Include="$(LuaDir)lbitlib.c">
|
||||||
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.1'">true</ExcludedFromBuild>
|
||||||
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="$(LuaDir)lcode.c" />
|
<ClCompile Include="$(LuaDir)lcode.c" />
|
||||||
@@ -354,4 +355,4 @@
|
|||||||
<Target Name="AfterRebuild">
|
<Target Name="AfterRebuild">
|
||||||
<MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
|
<MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
|
||||||
</Target>
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER
|
|||||||
export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB
|
export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB
|
||||||
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
|
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
|
||||||
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
|
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
|
||||||
export LUA_VERSION=5.4.0
|
export LUA_VERSION=5.4.1
|
||||||
mkdir -p lib
|
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
|
||||||
|
|||||||
Reference in New Issue
Block a user