Compare commits

...

2 commits

Author SHA1 Message Date
6423dc4610 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
2025-05-26 17:59:56 -04:00
6f0b585bfe Quick addition to the makefile, run_iso will build the ISO image and
then run the full image. As opposed to run, which will just run the
kernel from QEMU.
2025-05-26 17:46:55 -04:00

View file

@ -3,7 +3,10 @@
#Some definitions #Some definitions
SRC_DIR = src SRC_DIR = src
BUILD_DIR = build BUILD_DIR = build
LOADER_DIR = module_bootloader LOADER_DIR = module_bootloader
LOADER_NAME = uOS.iso
LOADER_IMG = $(BUILD_DIR)/$(LOADER_NAME)
KERNEL_MAIN = $(SRC_DIR)/main.c KERNEL_MAIN = $(SRC_DIR)/main.c
KERNEL_MAIN_OBJ = $(BUILD_DIR)/main.o KERNEL_MAIN_OBJ = $(BUILD_DIR)/main.o
@ -37,12 +40,17 @@ $(KERNEL_IMG): $(KERNEL_MAIN_OBJ) $(ENTRY_ASM_OBJ)
run: all run: all
$(QEMU) -kernel $(KERNEL_IMG) $(QEMU) -kernel $(KERNEL_IMG)
iso: all $(LOADER_IMG): $(KERNEL_IMG)
mv $(KERNEL_IMG) $(LOADER_DIR)/src/boot/; \ cp $(KERNEL_IMG) $(LOADER_DIR)/src/boot/; \
cd $(LOADER_DIR); \ cd $(LOADER_DIR); \
make all; \ make all; \
cd ..; \ cd ..; \
mv $(LOADER_DIR)/build/uOS.iso $(BUILD_DIR)/ cp $(LOADER_DIR)/$(LOADER_IMG) $(BUILD_DIR)/
iso: $(LOADER_IMG)
run_iso: iso
$(QEMU) -cdrom $(LOADER_IMG)
clean: clean:
rm -rf $(BUILD_DIR)/* rm -rf $(BUILD_DIR)/*