summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Gayot <duskcoder@gmail.com>2015-10-10 11:19:59 +0200
committerOlivier Gayot <duskcoder@gmail.com>2015-10-10 11:19:59 +0200
commit59974248187229378f1df28b224a2d02e2d13fe4 (patch)
tree926835889877d83e490bb0a4e07925d473d6ef0d
parenta9dbef9185854c1b94fb79dc7cfecbe34638c65b (diff)
kfs: fixed Makefile
* we removed the option -nographic to be able to display the framebuffer. * the execution of qemu is done as a body of a rule Signed-off-by: Olivier Gayot <duskcoder@gmail.com>
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3ccecb1..66da24e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ OBJ = $(SRC:.c=.o)
all: $(NAME)
$(NAME): $(OBJ) $(LDSCRIPT)
- # TODO
$(CC) -o $@ $^ $(LDFLAGS)
clean:
@@ -29,10 +28,10 @@ distclean: mrproper
$(RM) $(wildcard $(addsuffix .sw*,$(addprefix .,$(SRC))))
boot: all
- $(shell qemu-system-x86_64 -kernel $(NAME) -nographic)
+ qemu-system-i386 -kernel $(NAME)
debug: all
- $(shell qemu-system-x86_64 -kernel $(NAME) -s -S)
+ qemu-system-i386 -kernel $(NAME) -s -S
.PHONY: all clean mrproper distclean boot