summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-11-26 01:17:24 +0100
committerMichal Idziorek <m.i@gmx.at>2014-11-26 01:17:24 +0100
commitaad4bfe0261ea623342adc392728281be5062967 (patch)
treee49cf2ad6a478cd66193ff7046a7d993d503e461 /Makefile
parent297051e4a13a18d9b9e68122b12b1ea4aeb62c6e (diff)
added qemu target to Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6806c1b..83b07d3 100644
--- a/Makefile
+++ b/Makefile
@@ -143,9 +143,12 @@ $(FOOLOS_VDI): $(FOOLOS)
VBoxManage convertfromraw $< $@ --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c
# run in our local bochs (we need cirrus support for our vesa mode)
-run: all
+run-bochs: all
~/opt/bochs-2.6.6/bochs -q -f bochs/bochsrc -rc bochs/bochsdebug
+run-qemu: all
+ qemu-system-i386 $(FOOLOS)
+
newrun: clean run