summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlex AUVOLAT <alex.auvolat@ens.fr>2014-10-28 11:50:09 +0100
committerAlex AUVOLAT <alex.auvolat@ens.fr>2014-10-28 11:50:09 +0100
commit9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c (patch)
treef81efe30c84f1880dc8bd222a228132a93044191 /Makefile
parenteb0efe075de6c27512499bfc81bacb974e6146dd (diff)
downloadMelon-9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c.tar.gz
Melon-9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c.zip
Revive Melon
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7a20bdb..7cf12d8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,8 @@ Files = $(Kernel) $(RamFS)
Floppy = Melon.img
HDD = HDD.img
+QemuCmd = qemu-system-i386
+
all:
for p in $(Projects); do \
echo "=> Building $$p"; \
@@ -81,13 +83,13 @@ bochs: $(Floppy)
bochs -f Bochs.cfg
qemu: $(Floppy)
- qemu -fda $(Floppy) -hda $(HDD) -boot a -m 16
+ $(QemuCmd) -fda $(Floppy) -hda $(HDD) -boot a -m 16
qemu-hdd: $(HDD)
- qemu -fda $(Floppy) -hda $(HDD) -boot c -m 16
+ $(QemuCmd) -fda $(Floppy) -hda $(HDD) -boot c -m 16
qemu_debug:
- qemu -fda $(Floppy) -hda $(HDD) -boot a -m 16 -s -S & gdb Source/Kernel/Melon.ke -x Qemu-GDB-Debug-CMD
+ $(QemuCmd) -fda $(Floppy) -hda $(HDD) -boot a -m 16 -s -S & gdb Source/Kernel/Melon.ke -x Qemu-GDB-Debug-CMD
stats:
echo; echo " ** Statistics for project O3S ** "; \