Build už počítá i s appkama
Makefile nově kompiluje i soubory v apps a vytváří pro ně build složku, takže se demo aplikace opravdu přibalí do buildu.
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user