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/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index a6c77da..29a8a02 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": [ @@ -15,7 +14,6 @@ { "name": "Debug", "includePath": [ - "${workspaceFolder}/lua/src", "${workspaceFolder}/../kolibrios/contrib/sdk/sources/newlib/libc/include" ], "defines": [ diff --git a/Makefile b/Makefile index a842386..cc2c473 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -LUA_V = 54 + +LUA_V = 5.4 SYSCALLS_VER_A = 2 SYSCALLS_VER_B = 0 SYSCALLS_VER_C = 0 @@ -9,9 +10,9 @@ LD = kos32-ld STRIP = kos32-strip OBJCOPY = kos32-objcopy 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) -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 @@ -25,7 +26,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 -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 SYSLIBS = -nostdlib -L $(SDK_DIR)/lib -L$(TOOLCHAIN_PATH)/lib -L$(TOOLCHAIN_PATH)/mingw32/lib -lgcc -lc.dll -ldll MYCFLAGS = diff --git a/lua b/lua deleted file mode 160000 index eae2ea0..0000000 --- a/lua +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eae2ea0aaa2c4d0ad9e9c5c6594f9b2378971ced