From 364b023b2c50a7e810bf4f975150fc50c179e135 Mon Sep 17 00:00:00 2001 From: Carlos Maiolino Date: Sun, 14 Sep 2025 14:19:41 +0200 Subject: Build heap and kernel_heap Wire the build of both the heap API and the kernel_heap in the Makefile Signed-off-by: Carlos Maiolino --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 040c846..af34ee1 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,9 @@ KOBJ_FILES = $(KERNEL_ASM_OBJ) \ ./build/vga.o \ ./build/idt/idt.asm.o \ ./build/idt/idt.o \ - ./build/io/io.asm.o + ./build/io/io.asm.o \ + ./build/mm/heap.o \ + ./build/mm/kernel_heap.o BOOT_TGT =./bin/boot.bin @@ -61,6 +63,12 @@ $(BUILD_DIR)/idt/idt.o: ./src/idt/idt.c ./build/vga.o $(KOBJ_LIBS) $(BUILD_DIR)/io/io.asm.o: ./src/io/io.asm nasm -f elf -g ./src/io/io.asm -o $(BUILD_DIR)/io/io.asm.o +$(BUILD_DIR)/mm/heap.o: ./src/mm/heap.c + i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./src/mm/heap.c -o $(BUILD_DIR)/mm/heap.o + +$(BUILD_DIR)/mm/kernel_heap.o: ./src/mm/kernel_heap.c + i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./src/mm/kernel_heap.c -o $(BUILD_DIR)/mm/kernel_heap.o + $(KOBJ_LIBS): i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./src/lib/string.c -o $(BUILD_DIR)/string.o clean: @@ -74,4 +82,5 @@ clean: rm -f build/idt/idt.asm.o rm -f build/idt/idt.o rm -f build/io/io.asm.o + rm -f build/mm/*.o rm -f bin/os.bin -- cgit v1.2.3