Compare commits
No commits in common. "6423dc461082695659950bebb77dd3efe66d2107" and "0831fb86e41d4f5f29c5cfa40fcd227264f7cc65" have entirely different histories.
6423dc4610
...
0831fb86e4
1 changed files with 3 additions and 11 deletions
14
Makefile
14
Makefile
|
|
@ -3,10 +3,7 @@
|
||||||
#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
|
||||||
|
|
@ -40,17 +37,12 @@ $(KERNEL_IMG): $(KERNEL_MAIN_OBJ) $(ENTRY_ASM_OBJ)
|
||||||
run: all
|
run: all
|
||||||
$(QEMU) -kernel $(KERNEL_IMG)
|
$(QEMU) -kernel $(KERNEL_IMG)
|
||||||
|
|
||||||
$(LOADER_IMG): $(KERNEL_IMG)
|
iso: all
|
||||||
cp $(KERNEL_IMG) $(LOADER_DIR)/src/boot/; \
|
mv $(KERNEL_IMG) $(LOADER_DIR)/src/boot/; \
|
||||||
cd $(LOADER_DIR); \
|
cd $(LOADER_DIR); \
|
||||||
make all; \
|
make all; \
|
||||||
cd ..; \
|
cd ..; \
|
||||||
cp $(LOADER_DIR)/$(LOADER_IMG) $(BUILD_DIR)/
|
mv $(LOADER_DIR)/build/uOS.iso $(BUILD_DIR)/
|
||||||
|
|
||||||
iso: $(LOADER_IMG)
|
|
||||||
|
|
||||||
run_iso: iso
|
|
||||||
$(QEMU) -cdrom $(LOADER_IMG)
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(BUILD_DIR)/*
|
rm -rf $(BUILD_DIR)/*
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue