Update build and CI scripts to LUA 5.4

This commit is contained in:
Jean-Michel Picod committed 2024-09-20 17:21:17 +02:00
1 parent 0fcc3107b0
commit 18e3600d95
5 files changed
+13 -13

No files matched your search

+4 -4
View File
@@ -175,11 +175,11 @@ PM3INCLUDES += $(ID48LIBINC)
## Lua
ifneq ($(SKIPLUASYSTEM),1)
ifdef MACPORTS_PREFIX
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua-5.2 2>/dev/null)
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua-5.2 2>/dev/null)
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua-5.4 2>/dev/null)
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua-5.4 2>/dev/null)
else
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.2 2>/dev/null)
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.2 2>/dev/null)
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.4 2>/dev/null)
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.4 2>/dev/null)
endif
ifneq ($(LUALDLIBS),)
LUALIB =
+3 -3
View File
@@ -7,6 +7,7 @@ add_library(pm3rrg_rdv4_lua STATIC
liblua/ldump.c
liblua/lfunc.c
liblua/lgc.c
liblua/linit.c
liblua/llex.c
liblua/lmem.c
liblua/lobject.c
@@ -21,16 +22,15 @@ add_library(pm3rrg_rdv4_lua STATIC
liblua/lzio.c
liblua/lauxlib.c
liblua/lbaselib.c
liblua/lbitlib.c
liblua/lcorolib.c
liblua/ldblib.c
liblua/liolib.c
liblua/lmathlib.c
liblua/loadlib.c
liblua/loslib.c
liblua/lstrlib.c
liblua/ltablib.c
liblua/loadlib.c
liblua/linit.c
liblua/lutf8lib.c
)
target_compile_definitions(pm3rrg_rdv4_lua PRIVATE LUA_COMPAT_ALL)
@@ -1,8 +1,8 @@
#!/bin/bash
# pm3.so somewhere in default LUA_CPATH :
# /usr/local/lib/lua/5.2/pm3.so
# /usr/lib/lua/5.2/pm3.so
# /usr/local/lib/lua/5.4/pm3.so
# /usr/lib/lua/5.4/pm3.so
# ./pm3.so
./test.lua