X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/4c6d990440cdba6c7dd294adb7e435770ffcbcc4..e6416905c4afb34e61276cdc07c44813a3ebc5e7:/lunaix-os/makefile?ds=sidebyside

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 4ed0d3b..ede34f4 100644
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -3,10 +3,26 @@ include config/make-os
 include config/make-cc
 include config/make-debug-tool
 
+DEPS := $(CC) $(LD) xorriso grub-mkrescue
+
 INCLUDES := $(patsubst %, -I%, $(INCLUDES_DIR))
 SOURCE_FILES := $(shell find -name "*.[cS]")
 SRC := $(patsubst ./%, $(OBJECT_DIR)/%.o, $(SOURCE_FILES))
 
+$(DEPS):
+	@echo -n "checking $@ .... "
+	@if which $@ > /dev/null; then \
+		echo "ok";\
+	else\
+		echo "failed" && exit 1;\
+	fi
+
+check-cc:
+	@echo -n "checking target i686-elf.... "
+	@test "`i686-elf-gcc -dumpmachine`" = "i686-elf" && echo ok || (echo "failed" && exit 1)
+
+check: $(DEPS) check-cc
+
 $(OBJECT_DIR):
 	@mkdir -p $(OBJECT_DIR)
 
@@ -20,24 +36,27 @@ $(ISO_DIR):
 
 $(OBJECT_DIR)/%.S.o: %.S
 	@mkdir -p $(@D)
-	@echo " BUILD: $<"
+	@echo "  CC    $<"
 	@$(CC) $(INCLUDES) -c $< -o $@
 
 $(OBJECT_DIR)/%.c.o: %.c 
 	@mkdir -p $(@D)
-	@echo " BUILD: $<"
+	@echo "  CC    $<"
 	@$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
 
 $(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC)
-	@echo " LINK: $(BIN_DIR)/$(OS_BIN)"
+	@echo "  LD    $(BIN_DIR)/$(OS_BIN)"
 	@$(CC) -T link/linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
 
-$(BUILD_DIR)/$(OS_ISO): $(ISO_DIR) $(BIN_DIR)/$(OS_BIN) GRUB_TEMPLATE
+$(BUILD_DIR)/$(OS_ISO): check $(ISO_DIR) $(BIN_DIR)/$(OS_BIN) GRUB_TEMPLATE
 	@./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)
 
-all: clean $(BUILD_DIR)/$(OS_ISO)
+all: $(BUILD_DIR)/$(OS_ISO)
+
+instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
+instable: all
 
 all-debug: O := -Og
 all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
@@ -47,20 +66,29 @@ all-debug: clean $(BUILD_DIR)/$(OS_ISO)
 	@i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
 
 clean:
-	@rm -rf $(BUILD_DIR)
-	@sleep 1
+	@rm -rf $(BUILD_DIR) || exit 1
 
 run: $(BUILD_DIR)/$(OS_ISO)
-	@qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
+	@qemu-system-i386 $(QEMU_OPTIONS)
 	@sleep 1
 	@telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug
 	@i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
-	@qemu-system-i386 -s -S -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
+	@qemu-system-i386 $(QEMU_OPTIONS)
 	@sleep 1
-	@$(QEMU_MON_TERM) -e "telnet 127.0.0.1 $(QEMU_MON_PORT)"
+	@$(QEMU_MON_TERM) -- telnet 127.0.0.1 $(QEMU_MON_PORT)
 	@gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
 
+debug-qemu-vscode: all-debug
+	@i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+	@qemu-system-i386 $(QEMU_OPTIONS)
+	@sleep 0.5
+	@telnet 127.0.0.1 $(QEMU_MON_PORT)
+
 debug-bochs: all-debug
 	@bochs -q -f bochs.cfg
+
+debug-metal: 
+	@printf "@cmc" > $(PORT)
+	@gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote $(PORT)"
\ No newline at end of file