Fennix/Userspace
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Userspace.git synced 2025-07-11 15:19:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated libs

Browse Source
This commit is contained in:
Alex
2022-12-12 00:44:28 +02:00
parent dc1971acef
commit 9ff9b3a319
7 changed files with 1842 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/libssp/Makefile
View File

@ -12,11 +12,8 @@ AR = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)ar
NASM = /usr/bin/nasm
C_SOURCES = $(shell find ./ -type f -name '*.c')
S_SOURCES = $(shell find ./ -type f -name '*.s')
ASM_SOURCES = $(shell find ./ -type f -name '*.asm')
OBJ = ${C_SOURCES:.c=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURCES:.s=.o}
INCLUDE_DIR = ../include
OBJ = ${C_SOURCES:.c=.o} ${ASM_SOURCES:.asm=.o}
ifeq ($(OSARCH), amd64)
ASM_ARCH := elf64
@ -24,21 +21,21 @@ else ifeq ($(OSARCH), i686)
ASM_ARCH := elf32
endif
CFLAGS := -fPIC -I$(INCLUDE_DIR)
CFLAGS := -fPIC -I../include -I../../libc/include
build: $(OBJECT_NAME)
$(OBJECT_NAME): $(OBJ)
$(AR) rcs $(OUTPUT_DIR)$@ $(OBJ)
$(AR) rcs $(OUTPUT_DIR)$@ $(OBJ)
%.o: %.c $(HEADERS) $(HEADERS2)
%.o: %.c
$(CC) $(CFLAGS) -std=c17 -c $< -o $@
%.o: %.cpp $(HEADERS) $(HEADERS2)
%.o: %.cpp
$(CC) $(CFLAGS) -std=c++20 -c $< -o $@
%.o: %.asm
$(NASM) $< -f $(ASM_ARCH) -o $@
clean:
rm -f $(OBJ)