From 36e8ee0cdaa904ee00710b1d2df16691729cc93d Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Tue, 2 Feb 2021 22:27:27 +0200
Subject: Print some multiboot2 information

---
 makefile | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 10cfacf..b149337 100644
--- a/makefile
+++ b/makefile
@@ -9,18 +9,23 @@ export AR := llvm-ar
 export NASM := nasm
 export LD := ld.lld
 export CXX := clang++
-export CXX_FLAGS := -std=c++20 -ffreestanding -nostdinc -fno-exceptions -fno-rtti -Wall -Wextra -O2
-CXX_INCLUDE := libk
+export CXX_FLAGS := -std=c++20 -ffreestanding \
+    -nostdlib -nostdinc -nostdinc++ \
+    -fno-exceptions -fno-rtti -Wall -Wextra -O2
+CXX_INCLUDE := $(CURDIR)/libk
 CXX_OBJ := kernel.o vga.o
 
 # $@ is target
 # $< is first dependency
 # $^ is all dependencies
 
-default: myos.bin
+default: glitch.elf
 
-myos.bin: boot.o $(CXX_OBJ) libk/libk.a
-	$(LD) -T linker.ld -o myos.bin boot.o $(CXX_OBJ) -Llibk -lk
+check-grub: glitch.elf
+	grub-file --is-x86-multiboot2 glitch.elf
+
+glitch.elf: boot.o $(CXX_OBJ) libk/libk.a
+	$(LD) -T linker.ld -o glitch.elf boot.o $(CXX_OBJ) -Llibk -lk
 
 boot.o: boot.asm
 	$(NASM) -felf32 -o $@ $^
@@ -31,17 +36,19 @@ $(CXX_OBJ): %.o : %.cc
 libk/libk.a:
 	$(MAKE) -C libk libk.a
 
-iso: myos.bin
+iso: glitch.elf
 	mkdir -p isodir/boot/grub
-	cp myos.bin isodir/boot/myos.bin
+	cp glitch.elf isodir/boot/glitch.elf
 	cp grub.cfg isodir/boot/grub/grub.cfg
 	grub-mkrescue -o myos.iso isodir
 
-run: myos.bin
-	qemu-system-i386 -kernel myos.bin
+run: glitch.elf
+	qemu-system-i386 -kernel glitch.elf
+run-iso: iso
+	qemu-system-i386 -cdrom myos.iso
 
 clean:
-	rm boot.o $(CXX_OBJ) myos.bin
+	rm boot.o $(CXX_OBJ) glitch.elf
 	$(MAKE) -C libk clean
 
 clean-iso:
-- 
cgit v1.2.1