Merge branch 'main' of git.chauvet.pro:starnakin/42_KFS
This commit is contained in:
commit
1894987afc
4
Makefile
4
Makefile
@ -12,8 +12,8 @@ LD := $(CC)
|
||||
LDFLAGS := -T boot/linker.ld -ffreestanding -O2 -nostdlib
|
||||
LIBS := ./libbozo/build/libbozo.a -lgcc
|
||||
|
||||
SSRC := $(wildcard $(SOURCEDIR)/*.s)
|
||||
CSRC := $(wildcard $(SOURCEDIR)/*.c)
|
||||
SSRC := $(shell find $(SOURCEDIR) -name '*.s')
|
||||
CSRC := $(shell find $(SOURCEDIR) -name '*.c')
|
||||
OBJ := $(patsubst $(SOURCEDIR)/%.c,$(OBJECTDIR)/%.o,$(CSRC))\
|
||||
$(patsubst $(SOURCEDIR)/%.s,$(OBJECTDIR)/%.o,$(SSRC))
|
||||
|
||||
|
@ -24,4 +24,6 @@ void kernel_main(void)
|
||||
/* Newline support is left as an exercise. */
|
||||
for (int i = 1001; i; i--)
|
||||
kprintf(0, "%d\n", i);
|
||||
while (true)
|
||||
terminal_getkey();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user