From 63359cb028c0188fed27d4af3e0e817669e5ab35 Mon Sep 17 00:00:00 2001 From: Egor00f Date: Sat, 26 Apr 2025 21:44:24 +0500 Subject: [PATCH 1/3] update lua --- Makefile | 2 +- lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 81b8f3e..6dc7034 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -LUA_V = 54 +LUA_V = 5.4 CC = kos32-gcc LD = kos32-ld diff --git a/lua b/lua index eae2ea0..7d5b022 160000 --- a/lua +++ b/lua @@ -1 +1 @@ -Subproject commit eae2ea0aaa2c4d0ad9e9c5c6594f9b2378971ced +Subproject commit 7d5b022b1ae7c4195d6abcabde22855f1aa997d3 From 5319af905686fa1abcd16aa7bdecb3b476df0a53 Mon Sep 17 00:00:00 2001 From: Egor00f Date: Sat, 26 Apr 2025 22:42:45 +0500 Subject: [PATCH 2/3] delete lua --- .gitmodules | 3 --- lua | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lua diff --git a/.gitmodules b/.gitmodules index 3129a53..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "lua"] - path = lua - url = https://git.kolibrios.org/lua/lua.git diff --git a/lua b/lua deleted file mode 160000 index 7d5b022..0000000 --- a/lua +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7d5b022b1ae7c4195d6abcabde22855f1aa997d3 From e6cc79ee8b2c35c978794de18906dfb15b4c1659 Mon Sep 17 00:00:00 2001 From: Egor00f Date: Sat, 26 Apr 2025 22:43:31 +0500 Subject: [PATCH 3/3] make build for different lua versions --- .vscode/c_cpp_properties.json | 2 -- Makefile | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 936f463..9ab557c 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -3,7 +3,6 @@ { "name": "Release", "includePath": [ - "${workspaceFolder}/lua/src", "${workspaceFolder}/../kolibrios/contrib/sdk/sources/newlib/libc/include" ], "defines": [] @@ -11,7 +10,6 @@ { "name": "Debug", "includePath": [ - "${workspaceFolder}/lua/src", "${workspaceFolder}/../kolibrios/contrib/sdk/sources/newlib/libc/include" ], "defines": [ diff --git a/Makefile b/Makefile index 6dc7034..6d6afb6 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ OBJCOPY = kos32-objcopy STD = -std=gnu11 CFLAGS = $(SYSCFLAGS) -O2 -Wall -Wextra $(STD) $(MYCFLAGS) 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) TOOLCHAIN_PATH = C:/MinGW/msys/1.0/home/autobuild/tools/win32 @@ -21,7 +21,7 @@ KOLIBRIOS_REPO = $(abspath ../kolibrios) SDK_DIR = $(KOLIBRIOS_REPO)/contrib/sdk 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 +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 SYSLIBS = -nostdlib -L $(SDK_DIR)/lib -L$(TOOLCHAIN_PATH)/lib -L$(TOOLCHAIN_PATH)/mingw32/lib -lgcc -lc.dll -ldll MYCFLAGS =