From 873a103fb71d6b7b1993a64535a7fa150317ca3c Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sat, 7 Feb 2015 10:08:34 -0500 Subject: refactor stdio --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 33188bf..582f7c5 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ CC = gcc LD = ld INCLUDES = -Idrivers/include -Ikernel/include -Ilibc/include CFLAGS = -std=gnu99 -ffreestanding -fno-stack-protector -nostdlib -Wall -Wextra -m32 $(INCLUDES) -g -EMULATOR = qemu-system-i386 +QEMU = qemu-system-i386 +BOCHS = bochs AS = as ASFLAGS=-march=i686 --32 @@ -14,7 +15,11 @@ all: kappa.bin test: iso @echo "EMULATOR kappa.iso" - @$(EMULATOR) kappa.iso + @$(QEMU) kappa.iso + +test-bochs: iso + @echo "BOCHS bochs.cfg" + @$(BOCHS) -f bochs.cfg -q iso: kappa.bin @echo "Building ISO under $(ISODIR)/..." -- cgit v1.1