starnakin/42_KFS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of git.chauvet.pro:starnakin/42_KFS

Browse Source
This commit is contained in:
0x35c 2024-09-07 14:37:47 +02:00
commit 1894987afc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -12,8 +12,8 @@ LD := $(CC)
LDFLAGS := -T boot/linker.ld -ffreestanding -O2 -nostdlib LDFLAGS := -T boot/linker.ld -ffreestanding -O2 -nostdlib
LIBS := ./libbozo/build/libbozo.a -lgcc LIBS := ./libbozo/build/libbozo.a -lgcc
SSRC := $(wildcard $(SOURCEDIR)/*.s) SSRC := $(shell find $(SOURCEDIR) -name '*.s')
CSRC := $(wildcard $(SOURCEDIR)/*.c) CSRC := $(shell find $(SOURCEDIR) -name '*.c')
OBJ := $(patsubst $(SOURCEDIR)/%.c,$(OBJECTDIR)/%.o,$(CSRC))\ OBJ := $(patsubst $(SOURCEDIR)/%.c,$(OBJECTDIR)/%.o,$(CSRC))\
$(patsubst $(SOURCEDIR)/%.s,$(OBJECTDIR)/%.o,$(SSRC)) $(patsubst $(SOURCEDIR)/%.s,$(OBJECTDIR)/%.o,$(SSRC))

2
src/kernel.c
View File

@ -24,4 +24,6 @@ void kernel_main(void)
/* Newline support is left as an exercise. */ /* Newline support is left as an exercise. */
for (int i = 1001; i; i--) for (int i = 1001; i; i--)
kprintf(0, "%d\n", i); kprintf(0, "%d\n", i);
while (true)
terminal_getkey();
} }