use ld instead gcc
This commit is contained in:
6
.vscode/c_cpp_properties.json
vendored
6
.vscode/c_cpp_properties.json
vendored
@@ -1,8 +1,10 @@
|
||||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Release",
|
||||
"name": "Windows Lua5.4",
|
||||
"includePath": [
|
||||
"C:/MinGW/msys/1.0/home/autobuild/tools/win32/include",
|
||||
"C:/MinGW/msys/1.0/home/autobuild/tools/win32/include/lua5.4",
|
||||
"${workspaceFolder}/../kolibrios/contrib/sdk/sources/newlib/libc/include"
|
||||
],
|
||||
"defines": [
|
||||
@@ -14,6 +16,8 @@
|
||||
{
|
||||
"name": "Debug",
|
||||
"includePath": [
|
||||
"/home/autobuild/tools/win32/include",
|
||||
"/home/autobuild/tools/win32/include/lua5.4",
|
||||
"${workspaceFolder}/../kolibrios/contrib/sdk/sources/newlib/libc/include"
|
||||
],
|
||||
"defines": [
|
||||
|
7
Makefile
7
Makefile
@@ -12,7 +12,7 @@ OBJCOPY = kos32-objcopy
|
||||
STD = -std=gnu11
|
||||
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) -llua$(LUA_V).dll.a
|
||||
LIBS = $(SYSLIBS) $(MYLIBS) -llua$(LUA_V).dll
|
||||
|
||||
ifeq ($(OS), Windows_NT)
|
||||
TOOLCHAIN_PATH = C:/MinGW/msys/1.0/home/autobuild/tools/win32
|
||||
@@ -27,8 +27,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$(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
|
||||
SYSLIBS = -L $(SDK_DIR)/lib -lgcc -lc.dll -ldll
|
||||
MYCFLAGS =
|
||||
MYLDFLAGS =
|
||||
MYLIBS =
|
||||
@@ -42,7 +41,7 @@ Version_O = src/version/coreversion.o src/version/version_type.o
|
||||
ALL_O = src/syscalls.o src/ARP_entry.o src/systemColors.o src/graphic.o $(Socket_O) $(Debug_O) $(Version_O)
|
||||
|
||||
syscalls.dll: $(ALL_O)
|
||||
$(CC) -shared -T dll.lds --entry _DllStartup -o $@ $(ALL_O) $(LIBS)
|
||||
$(LD) -shared -T dll.lds --entry _DllStartup $(LDFLAGS) -o $@ $(ALL_O) $(LIBS)
|
||||
|
||||
clean:
|
||||
rm -f $(ALL_O) syscalls.dll
|
||||
|
1
lua
Submodule
1
lua
Submodule
repo.diff.submodule_added%!(EXTRA template.HTML=lua, template.HTML=eae2ea0aaa)
Reference in New Issue
Block a user