X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/42211aab6f00d307978b791a5e024eceabcc4eaf..a89063b334fdc0b254f0791fca1812354049b86d:/lunaix-os/makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 4993318..9ac9c3e 100644
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -20,43 +20,53 @@ $(ISO_DIR):
 
 $(OBJECT_DIR)/%.S.o: %.S
 	@mkdir -p $(@D)
-	$(CC) $(INCLUDES) -c $< -o $@
+	@echo " BUILD: $<"
+	@$(CC) $(INCLUDES) -c $< -o $@
 
 $(OBJECT_DIR)/%.c.o: %.c 
 	@mkdir -p $(@D)
-	$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
+	@echo " BUILD: $<"
+	@$(CC) $(INCLUDES) -c $< -o $@ $(CFLAGS)
 
 $(BIN_DIR)/$(OS_BIN): $(OBJECT_DIR) $(BIN_DIR) $(SRC)
-	$(CC) -T linker.ld -o $(BIN_DIR)/$(OS_BIN) $(SRC) $(LDFLAGS)
+	@echo " LINK: $(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
-	@./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)
 
 all: clean $(BUILD_DIR)/$(OS_ISO)
 
-all-debug: O := -O0
-all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) -fomit-frame-pointer
-all-debug: LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
+all-debug: O := -Og
+all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAIXOS_DEBUG__
+all-debug: LDFLAGS := -g -ffreestanding $(O) -nostdlib -lgcc
 all-debug: clean $(BUILD_DIR)/$(OS_ISO)
 	@echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
-	@i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
+	@${TOOLCHAIN}/i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
 
 clean:
-	@rm -rf $(BUILD_DIR)
+	@rm -rf $(BUILD_DIR) || exit 1
+	@sleep 2
 
 run: $(BUILD_DIR)/$(OS_ISO)
-	@qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::45454,server,nowait &
+	@qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) $(QEMU_OPTIONS)
 	@sleep 1
 	@telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug
-	@objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
-	@qemu-system-i386 -s -S -kernel $(BIN_DIR)/$(OS_BIN) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
+	@${TOOLCHAIN}/i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+	@qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) $(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
+	@${TOOLCHAIN}/i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+	@qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) $(QEMU_OPTIONS)
+	@sleep 0.5
+	@telnet 127.0.0.1 $(QEMU_MON_PORT)
+
 debug-bochs: all-debug
-	@bochs -q -f bochs.cfg
\ No newline at end of file
+	@bochs -q -f bochs.cfg