Fennix/Userspace
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Userspace.git synced 2025-07-10 14:49:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update filesystem structure

Browse Source
This commit is contained in:
Alex
2023-05-20 04:31:00 +03:00
parent 78cfe17749
commit d9485978bb
23 changed files with 74 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/Makefile
View File

@ -1,14 +1,12 @@
build:
cp -r include/* ../out/system/include
cp -r include/* ../out/usr/include
make -C libgcc build
make -C libinit build
make -C libssp build
make -C libsys build
make -C libgraph build
clean:
make -C libgcc clean
make -C libinit clean
make -C libssp clean
make -C libsys clean
make -C libgraph clean

2
libs/libgcc/Makefile
View File

@ -5,7 +5,7 @@ NAME=gcc
OBJECT_NAME=lib$(NAME).a
OUTPUT_DIR=../../out/system/lib/
OUTPUT_DIR=../../out/lib/
CC = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)gcc

15
libs/libgraph/Graphics.c
View File

@ -1,15 +0,0 @@
#include <libdraw.h>
#include "../../../Kernel/syscalls.h"
void DrawRect(int x, int y, int w, int h, int color)
{
int i, j;
for (i = 0; i < w; i++)
{
for (j = 0; j < h; j++)
{
// TODO: DrawPixel(x + i, y + j, color);
}
}
}

58
libs/libgraph/Makefile
View File

@ -1,58 +0,0 @@
# Config file
include ../../../Makefile.conf
NAME=graph
OBJECT_NAME=lib$(NAME).so
SO_NAME=$(OBJECT_NAME)
OUTPUT_DIR=../../out/system/lib/
SYSROOT = --sysroot=../../out/system/
CC = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)gcc
AS = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)as
AR = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)ar
OBJDUMP = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)objdump
NASM = /usr/bin/nasm
C_SOURCES = $(shell find ./ -type f -name '*.c')
CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
S_SOURCES = $(shell find ./ -type f -name '*.S')
ASM_SOURCES = $(shell find ./ -type f -name '*.asm')
OBJ = ${C_SOURCES:.c=.o} ${CPP_SOURCES:.cpp=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURCES:.S=.o}
ifeq ($(OSARCH), amd64)
ASM_ARCH := elf64
else ifeq ($(OSARCH), i386)
ASM_ARCH := elf32
endif
SIMD_FLAGS := -mno-sse -mno-sse2 -mno-sse3 -mno-ssse3 -mno-sse4.1 -mno-sse4.2 -mno-sse4 -mno-avx -mno-avx2 -mno-avx512f
CFLAGS := -fPIC -fPIE -I../include -I../../libc/include $(SIMD_FLAGS)
build: $(OBJECT_NAME)
$(OBJECT_NAME): $(OBJ)
$(info Linking $@)
$(CC) -nostdlib -shared -fPIC -fPIE -Wl,-soname,$(SO_NAME) $(SYSROOT) $(OBJ) -o $(OUTPUT_DIR)$@
$(OBJDUMP) -d $(OUTPUT_DIR)$@ > file_dump.map
%.o: %.c
$(info Compiling $<)
$(CC) $(CFLAGS) -std=c17 -c $< -o $@
%.o: %.cpp
$(info Compiling $<)
$(CC) $(CFLAGS) -std=c++20 -c $< -o $@
%.o: %.S
$(info Compiling $<)
$(AS) -c $< -o $@
%.o: %.asm
$(info Compiling $<)
$(NASM) $< -f $(ASM_ARCH) -o $@
clean:
rm -f file_dump.map $(OBJ)

4
libs/libinit/Makefile
View File

@ -6,8 +6,8 @@ NAME=init
OBJECT_NAME=lib$(NAME).so
SO_NAME=$(OBJECT_NAME)
OUTPUT_DIR=../../out/system/lib/
SYSROOT = --sysroot=../../out/system/
OUTPUT_DIR=../../out/lib/
SYSROOT = --sysroot=../../out/
CC = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)gcc
AS = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)as

2
libs/libssp/Makefile
View File

@ -5,7 +5,7 @@ NAME=ssp
OBJECT_NAME=lib$(NAME).a
OUTPUT_DIR=../../out/system/lib/
OUTPUT_DIR=../../out/lib/
CC = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)gcc
AR = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)ar

4
libs/libsys/Makefile
View File

@ -6,8 +6,8 @@ NAME=sys
OBJECT_NAME=lib$(NAME).so
SO_NAME=$(OBJECT_NAME)
OUTPUT_DIR=../../out/system/lib/
SYSROOT = --sysroot=../../out/system/
OUTPUT_DIR=../../out/lib/
SYSROOT = --sysroot=../../out/
CC = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)gcc
AS = ../../../$(TC_COMPILER_PATH)/$(TC_COMPILER_ARCH)as