make build for different lua versions
This commit is contained in:
2
.vscode/c_cpp_properties.json
vendored
2
.vscode/c_cpp_properties.json
vendored
@@ -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": []
|
||||||
@@ -11,7 +10,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": [
|
||||||
|
4
Makefile
4
Makefile
@@ -7,7 +7,7 @@ OBJCOPY = kos32-objcopy
|
|||||||
STD = -std=gnu11
|
STD = -std=gnu11
|
||||||
CFLAGS = $(SYSCFLAGS) -O2 -Wall -Wextra $(STD) $(MYCFLAGS)
|
CFLAGS = $(SYSCFLAGS) -O2 -Wall -Wextra $(STD) $(MYCFLAGS)
|
||||||
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
|
||||||
@@ -21,7 +21,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
|
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 =
|
||||||
|
Reference in New Issue
Block a user