From c75cfaecde3ed4f876322f8510ff18e0c1371c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Kala=C5=A1=20=28Floxen=29?= Date: Sun, 12 Jul 2026 19:33:50 +0200 Subject: [PATCH] =?UTF-8?q?Build=20u=C5=BE=20po=C4=8D=C3=ADt=C3=A1=20i=20s?= =?UTF-8?q?=20appkama?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Makefile nově kompiluje i soubory v apps a vytváří pro ně build složku, takže se demo aplikace opravdu přibalí do buildu. --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f88cb2c..f8b9fdd 100644 --- a/Makefile +++ b/Makefile @@ -35,12 +35,14 @@ KERNEL_OBJS := \ $(BUILD)/drivers/keyboard.o \ $(BUILD)/drivers/serial.o \ $(BUILD)/drivers/timer.o \ - $(BUILD)/drivers/storage.o + $(BUILD)/drivers/storage.o \ + $(BUILD)/apps/calc_app.o \ + $(BUILD)/apps/tetris_app.o all: $(IMG) $(BUILD): - mkdir -p $(BUILD)/boot $(BUILD)/kernel $(BUILD)/arch/x86_64 $(BUILD)/drivers + mkdir -p $(BUILD)/boot $(BUILD)/kernel $(BUILD)/arch/x86_64 $(BUILD)/drivers $(BUILD)/apps $(BUILD)/boot/boot.bin: boot/boot.asm | $(BUILD) $(AS) -f bin $< -o $@ @@ -60,6 +62,9 @@ $(BUILD)/kernel/%.o: kernel/%.c | $(BUILD) $(BUILD)/drivers/%.o: drivers/%.c | $(BUILD) $(CC) $(CFLAGS) -c $< -o $@ +$(BUILD)/apps/%.o: apps/%.c | $(BUILD) + $(CC) $(CFLAGS) -c $< -o $@ + $(BUILD)/kernel.elf: $(KERNEL_OBJS) linker.ld $(LD) $(LDFLAGS) -o $@ $(KERNEL_OBJS)