X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/c1811aecaae88bc006ce20bd301a6519dd89abda..f1036cb8c8899f38e97e45d345a0c28585d9a000:/lunaix-os/makefile?ds=sidebyside diff --git a/lunaix-os/makefile b/lunaix-os/makefile index abcde29..9d3c799 100644 --- a/lunaix-os/makefile +++ b/lunaix-os/makefile @@ -33,7 +33,7 @@ $(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC) @$(CC) -T linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS) $(BUILD_DIR)/$(OS_ISO): $(ISO_DIR) $(BIN_DIR)/$(OS_BIN) GRUB_TEMPLATE - @./config-grub.sh ${OS_NAME} > $(ISO_GRUB_DIR)/grub.cfg + @./config-grub.sh ${OS_NAME} $(ISO_GRUB_DIR)/grub.cfg @cp $(BIN_DIR)/$(OS_BIN) $(ISO_BOOT_DIR) @grub-mkrescue -o $(BUILD_DIR)/$(OS_ISO) $(ISO_DIR) @@ -48,6 +48,7 @@ all-debug: clean $(BUILD_DIR)/$(OS_ISO) clean: @rm -rf $(BUILD_DIR) + @sleep 1 run: $(BUILD_DIR)/$(OS_ISO) @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &