Lua/syscalls
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Projects Releases 1 Wiki Activity

Merge branch 'update-lua'

Browse Source
This commit is contained in:
Егор
2025-04-27 12:03:33 +05:00
parent 37ae2a28a9 e6cc79ee8b
commit a4042c34d4
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -1,3 +0,0 @@
[submodule "lua"]
path = lua
url = https://git.kolibrios.org/lua/lua.git

2
.vscode/c_cpp_properties.json vendored
View File

@@ -3,7 +3,6 @@
{ {
"name": "Release", "name": "Release",
"includePath": [ "includePath": [
"${workspaceFolder}/lua/src",
"${workspaceFolder}/../kolibrios/contrib/sdk/sources/newlib/libc/include" "${workspaceFolder}/../kolibrios/contrib/sdk/sources/newlib/libc/include"
], ],
"defines": [ "defines": [
@@ -15,7 +14,6 @@
{ {
"name": "Debug", "name": "Debug",
"includePath": [ "includePath": [
"${workspaceFolder}/lua/src",
"${workspaceFolder}/../kolibrios/contrib/sdk/sources/newlib/libc/include" "${workspaceFolder}/../kolibrios/contrib/sdk/sources/newlib/libc/include"
], ],
"defines": [ "defines": [

9
Makefile
View File

@@ -1,4 +1,5 @@
LUA_V = 54
LUA_V = 5.4
SYSCALLS_VER_A = 2 SYSCALLS_VER_A = 2
SYSCALLS_VER_B = 0 SYSCALLS_VER_B = 0
SYSCALLS_VER_C = 0 SYSCALLS_VER_C = 0
@@ -9,9 +10,9 @@ LD = kos32-ld
STRIP = kos32-strip STRIP = kos32-strip
OBJCOPY = kos32-objcopy OBJCOPY = kos32-objcopy
STD = -std=gnu11 STD = -std=gnu11
CFLAGS = $(SYSCFLAGS) -O2 -Wall -Wextra $(STD) $(MYCFLAGS) CFLAGS = $(SYSCFLAGS) -O2 -Wall -Wextra $(STD) $(MYCFLAGS) -DSYSCALLS_VERSION_A=$(SYSCALLS_VER_A) -DSYSCALLS_VERSION_B=$(SYSCALLS_VER_B) -DSYSCALLS_VERSION_C=$(SYSCALLS_VER_C)
LDFLAGS = $(SYSLDFLAGS) $(MYLDFLAGS) LDFLAGS = $(SYSLDFLAGS) $(MYLDFLAGS)
LIBS = $(SYSLIBS) $(MYLIBS) $(TOOLCHAIN_PATH)/mingw32/lib/lua$(LUA_V).dll.a LIBS = $(SYSLIBS) $(MYLIBS) -llua$(LUA_V).dll.a
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
TOOLCHAIN_PATH = C:/MinGW/msys/1.0/home/autobuild/tools/win32 TOOLCHAIN_PATH = C:/MinGW/msys/1.0/home/autobuild/tools/win32
@@ -25,7 +26,7 @@ KOLIBRIOS_REPO = $(abspath ../kolibrios)
SDK_DIR = $(KOLIBRIOS_REPO)/contrib/sdk SDK_DIR = $(KOLIBRIOS_REPO)/contrib/sdk
NewLib_DIR = $(SDK_DIR)/sources/newlib NewLib_DIR = $(SDK_DIR)/sources/newlib
SYSCFLAGS = -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -I$(NewLib_DIR)/libc/include -I$(abspath .)/lua/src -DSYSCALLS_VERSION_A=$(SYSCALLS_VER_A) -DSYSCALLS_VERSION_B=$(SYSCALLS_VER_B) -DSYSCALLS_VERSION_C=$(SYSCALLS_VER_C) SYSCFLAGS = -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -I$(NewLib_DIR)/libc/include -I$(TOOLCHAIN_PATH)/include/lua$(LUA_V)
SYSLDFLAGS = --image-base 0 -Tapp-dynamic.lds SYSLDFLAGS = --image-base 0 -Tapp-dynamic.lds
SYSLIBS = -nostdlib -L $(SDK_DIR)/lib -L$(TOOLCHAIN_PATH)/lib -L$(TOOLCHAIN_PATH)/mingw32/lib -lgcc -lc.dll -ldll SYSLIBS = -nostdlib -L $(SDK_DIR)/lib -L$(TOOLCHAIN_PATH)/lib -L$(TOOLCHAIN_PATH)/mingw32/lib -lgcc -lc.dll -ldll
MYCFLAGS = MYCFLAGS =

1
lua

repo.diff.submodule_deleted%!(EXTRA template.HTML=lua, template.HTML=eae2ea0aaa)