From b2f820660fb3e6047acbdb53d6cb0c63c0aac02d Mon Sep 17 00:00:00 2001
From: shockrahwow <alejandros714@protonmail.com>
Date: Tue, 15 Jan 2019 15:31:14 -0800
Subject: [PATCH] added basic run recipe

---
 makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/makefile b/makefile
index 0a3fb59..1f4fbf2 100644
--- a/makefile
+++ b/makefile
@@ -2,6 +2,8 @@ ASM=nasm
 CC=gcc
 LINK=ld
 ISO=genisoimage
+EMU=bochs
+emuconfig='bochsrc.conf'
 
 all: loader link iso
 	echo 'yeeting'
@@ -15,6 +17,9 @@ loader: loader.asm
 link: loader.o
 	$(LINK) -T link.ld -melf_i386 loader.o -o kernel.elf
 
+run:
+	$(EMU) -f $(emuconfig) -q 
+
 # build the iso file into our target directory
 iso:
 	$(ISO) -R							\