Makefile is getting a little messy, i'll rework it later, probably.
Anyway, now: make iso -> creates iso with bootloader make run_iso -> runs iso in qemu make run -> runs kernel without bootloader or img creation
This commit is contained in:
parent
6f0b585bfe
commit
6423dc4610
1 changed files with 8 additions and 5 deletions
13
Makefile
13
Makefile
|
|
@ -5,7 +5,8 @@ SRC_DIR = src
|
|||
BUILD_DIR = build
|
||||
|
||||
LOADER_DIR = module_bootloader
|
||||
LOADER_IMG = uOS.iso
|
||||
LOADER_NAME = uOS.iso
|
||||
LOADER_IMG = $(BUILD_DIR)/$(LOADER_NAME)
|
||||
|
||||
KERNEL_MAIN = $(SRC_DIR)/main.c
|
||||
KERNEL_MAIN_OBJ = $(BUILD_DIR)/main.o
|
||||
|
|
@ -39,15 +40,17 @@ $(KERNEL_IMG): $(KERNEL_MAIN_OBJ) $(ENTRY_ASM_OBJ)
|
|||
run: all
|
||||
$(QEMU) -kernel $(KERNEL_IMG)
|
||||
|
||||
iso: all
|
||||
mv $(KERNEL_IMG) $(LOADER_DIR)/src/boot/; \
|
||||
$(LOADER_IMG): $(KERNEL_IMG)
|
||||
cp $(KERNEL_IMG) $(LOADER_DIR)/src/boot/; \
|
||||
cd $(LOADER_DIR); \
|
||||
make all; \
|
||||
cd ..; \
|
||||
mv $(LOADER_DIR)/build/$(LOADER_IMG) $(BUILD_DIR)/
|
||||
cp $(LOADER_DIR)/$(LOADER_IMG) $(BUILD_DIR)/
|
||||
|
||||
iso: $(LOADER_IMG)
|
||||
|
||||
run_iso: iso
|
||||
$(QEMU) -cdrom $(BUILD_DIR)/$(LOADER_IMG)
|
||||
$(QEMU) -cdrom $(LOADER_IMG)
|
||||
|
||||
clean:
|
||||
rm -rf $(BUILD_DIR)/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue