aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFranklin Wei <frankhwei536@gmail.com>2015-02-07 10:08:34 -0500
committerFranklin Wei <frankhwei536@gmail.com>2015-02-07 10:08:34 -0500
commit873a103fb71d6b7b1993a64535a7fa150317ca3c (patch)
tree4290bfee363c455d4e6dd1a30732fd306e7d23b6 /Makefile
parent9d7d5c592702e23f1108046d42d5cf550ab9633e (diff)
downloadkappa-873a103fb71d6b7b1993a64535a7fa150317ca3c.zip
kappa-873a103fb71d6b7b1993a64535a7fa150317ca3c.tar.gz
kappa-873a103fb71d6b7b1993a64535a7fa150317ca3c.tar.bz2
kappa-873a103fb71d6b7b1993a64535a7fa150317ca3c.tar.xz
refactor stdio
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
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)/..."