Compare commits
4
Commits
eae2ea0aaa
...
7d5b022b1a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d5b022b1a | ||
|
|
d0c575c098 | ||
|
|
ab7d2ad788 | ||
|
|
9acbf685dc |
No files matched your search
@@ -4,7 +4,7 @@
|
||||
# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
|
||||
|
||||
# Your platform. See PLATS for possible values.
|
||||
PLAT= kolibrios
|
||||
PLAT= shared
|
||||
|
||||
# Where to install. The installation starts in the src and doc directories,
|
||||
# so take care if INSTALL_TOP is not an absolute path. See the local target.
|
||||
@@ -45,8 +45,9 @@ TO_MAN= lua.1 luac.1
|
||||
V= 5.4
|
||||
R= $V.7
|
||||
|
||||
PLATS = shared static
|
||||
|
||||
shared static static-with-syscalls syscalls.dll help test:
|
||||
$(PLATS) help test:
|
||||
@cd src && $(MAKE) $@
|
||||
|
||||
install: dummy
|
||||
@@ -65,23 +66,6 @@ uninstall:
|
||||
local:
|
||||
$(MAKE) install INSTALL_TOP=../install
|
||||
|
||||
TOOLCHAIN_DIR=home/autobuild/tools/win32
|
||||
PACKAGE=package
|
||||
|
||||
PACKAGE_INCLUDE_PATH=$(PACKAGE)/$(TOOLCHAIN_DIR)/include/lua
|
||||
PACKAGE_LIB_PATH=$(PACKAGE)/$(TOOLCHAIN_DIR)/lib
|
||||
|
||||
# Build deb package with include headers
|
||||
$(PACKAGE): shared static
|
||||
$(MKDIR) $(PACKAGE_INCLUDE_PATH)
|
||||
$(MKDIR) $(PACKAGE_LIB_PATH)
|
||||
|
||||
cp -f src/*.h $(PACKAGE_INCLUDE_PATH)
|
||||
cp -f src/lua54.dll.a $(PACKAGE_LIB_PATH)
|
||||
cp -f src/liblua.a $(PACKAGE_LIB_PATH)
|
||||
|
||||
dpkg-deb --build $@ $@.deb
|
||||
|
||||
# make may get confused with install/ if it does not support .PHONY.
|
||||
dummy:
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
[](https://github.com/Egor00f/lua-kolibrios/actions/workflows/build.yml)
|
||||
|
||||
This is port for KolibriOS of Lua 5.4.7
|
||||
|
||||
For installation instructions, license details, and
|
||||
@@ -7,7 +5,7 @@ further information about Lua, see `doc/readme.html`.
|
||||
|
||||
## Build
|
||||
|
||||
for build you need install gcc toolchain([installer](https://github.com/Egor00f/kolibrios-gcc-toolchain))
|
||||
for build you need install gcc toolchain([installer](https://git.kolibrios.org/Egor00f/kolibrios-gcc-toolchain))
|
||||
|
||||
### Shared build
|
||||
```
|
||||
@@ -19,12 +17,3 @@ make shared
|
||||
make static
|
||||
```
|
||||
|
||||
### Static build with syscalls library
|
||||
```
|
||||
make static-with-syscalls
|
||||
```
|
||||
|
||||
### Shared syscalls library
|
||||
```
|
||||
make syscalls.dll
|
||||
```
|
||||
@@ -1,12 +0,0 @@
|
||||
Package: kos32-lua-dev
|
||||
Version: 0.1.3
|
||||
Architecture: amd64
|
||||
Section: devel
|
||||
Depends: kos-newlib
|
||||
Pre-Depends: kos32-gcc
|
||||
Priority: optional
|
||||
Homepage: https://github.com/Egor00f/lua-kolbirios
|
||||
Maintainer: Egor00f <velikiydolbayeb@gmail.com>
|
||||
Installed-Size: 812
|
||||
Description: kolibrios lua port for dev
|
||||
Contain lua headers and builded lib
|
||||
+5
-12
@@ -52,7 +52,7 @@ CMCFLAGS=
|
||||
|
||||
PLATS= c89
|
||||
|
||||
LUA_A= liblua.a
|
||||
LUA_A= liblua5.4.a
|
||||
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
|
||||
LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
|
||||
BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
|
||||
@@ -64,15 +64,15 @@ LUAC_T= luac
|
||||
LUAC_O= luac.o
|
||||
|
||||
|
||||
LUA_S = lua54.dll
|
||||
LUA_S = liblua5.4.dll
|
||||
LUA_S_IMP = $(LUA_S).a
|
||||
|
||||
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) lsyscalls.o
|
||||
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
|
||||
ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
||||
ALL_A= $(LUA_A)
|
||||
ALL_S= $(LUA_S) $(LUA_S) $(LUA_S_IMP) syscalls.dll
|
||||
ALL_S= $(LUA_S) $(LUA_S) $(LUA_S_IMP)
|
||||
|
||||
default: shared $(LUA_A) syscalls.dll
|
||||
default: shared $(LUA_A)
|
||||
|
||||
o: $(ALL_O)
|
||||
|
||||
@@ -107,16 +107,10 @@ $(LUA_T_S): $(LUA_O) $(LUA_S)
|
||||
|
||||
static: $(ALL_T)
|
||||
|
||||
static-with-syscalls:
|
||||
make "MYCFLAGS=$(MYCFLAGS) -DLUA_ENABLE_SYSCALLS" "LIB_O=$(LIB_O) lsyscalls.o" static
|
||||
|
||||
shared:
|
||||
make "ARFLAGS=crs" "LUA_T_S=lua" "LUA_T=" lua
|
||||
make "LUAC_T=luac" luac
|
||||
|
||||
syscalls.dll: lsyscalls.o $(LUA_S)
|
||||
$(CC) -shared -T dll.lds --entry _DllStartup -o $@ lsyscalls.o $(LUA_S) $(SYSLIBS)
|
||||
|
||||
test:
|
||||
./$(LUA_T) -v
|
||||
|
||||
@@ -236,6 +230,5 @@ lvm.o: lvm.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
|
||||
ltable.h lvm.h ljumptab.h
|
||||
lzio.o: lzio.c lprefix.h lua.h luaconf.h llimits.h lmem.h lstate.h \
|
||||
lobject.h ltm.h lzio.h
|
||||
lsyscalls.o: lsyscalls.c lua.h lualib.h lauxlib.h
|
||||
|
||||
# (end of Makefile)
|
||||
@@ -49,9 +49,6 @@ static const luaL_Reg loadedlibs[] = {
|
||||
{LUA_MATHLIBNAME, luaopen_math},
|
||||
{LUA_UTF8LIBNAME, luaopen_utf8},
|
||||
{LUA_DBLIBNAME, luaopen_debug},
|
||||
#ifdef LUA_ENABLE_SYSCALLS
|
||||
{LUA_SYSCALLSNAME, luaopen_syscalls},
|
||||
#endif
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
|
||||
-2665
File diff suppressed because it is too large.
Load diff
@@ -44,11 +44,6 @@ LUAMOD_API int (luaopen_debug) (lua_State *L);
|
||||
#define LUA_LOADLIBNAME "package"
|
||||
LUAMOD_API int (luaopen_package) (lua_State *L);
|
||||
|
||||
#ifdef LUA_ENABLE_SYSCALLS
|
||||
#define LUA_SYSCALLSNAME "syscalls"
|
||||
LUALIB_API int luaopen_syscalls(lua_State *L);
|
||||
#endif
|
||||
|
||||
/* open all previous libraries */
|
||||
LUALIB_API void (luaL_openlibs) (lua_State *L);
|
||||
|
||||
|
||||
Reference in new issue
Block a user