diff options
| author | Marvin Borner | 2020-09-03 18:47:38 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-09-03 18:47:38 +0200 |
| commit | 15a8cb8fa64b12d6c0b65eafb226971cd66dc3cd (patch) | |
| tree | 10669f647c05299601497c277b2d4d4e89c4c9af /kernel/Makefile | |
| parent | d79b7492910d4a77b8c3a70f28c5ea4c81a0b2e5 (diff) | |
Moved test to app
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index a907986..07f985a 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,6 +1,7 @@ # MIT License, Copyright (c) 2020 Marvin Borner -COBJS = drivers/interrupts.o \ +COBJS = main.o \ + drivers/interrupts.o \ drivers/interrupts_asm.o \ drivers/keyboard.o \ drivers/mouse.o \ @@ -25,7 +26,6 @@ CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builti ASFLAGS = -f elf32 all: compile bootloader -test: compile_test bootloader %.o: %.c @$(CC) -c $(CFLAGS) $< -o $@ @@ -37,15 +37,7 @@ bootloader: @mkdir -p ../build/ @$(AS) -f bin entry.asm -o ../build/boot.bin -compile: main.o $(COBJS) +compile: $(COBJS) @mkdir -p ../build/ @$(LD) -N -ekernel_main -Ttext 0x00050000 -o ../build/kernel.bin -L../build/ $+ -lk --oformat binary @$(CC) $(CFLAGS) -o ../build/debug.o -L../build/ $+ -lk - -compile_test: CFLAGS += -Dtest -Wl,-etest_all -compile_test: test.o $(COBJS) - @mkdir -p ../build/ - @$(LD) -N -etest_all -Ttext 0x00050000 -o ../build/kernel.bin -L../build/ $+ -lk --oformat binary - @$(CC) $(CFLAGS) -o ../build/debug.o -L../build/ $+ -lk - -.PHONY: test compile_test |