aboutsummaryrefslogtreecommitdiff
path: root/i686
diff options
context:
space:
mode:
Diffstat (limited to 'i686')
-rw-r--r--i686/Makefile5
-rw-r--r--i686/boot.S2
2 files changed, 5 insertions, 2 deletions
diff --git a/i686/Makefile b/i686/Makefile
index 6bbc642..9aa0ed1 100644
--- a/i686/Makefile
+++ b/i686/Makefile
@@ -1,9 +1,12 @@
include ../Makefile.config
+INCLUDES := -isystem../grub
+CFLAGS += ${INCLUDES}
+CXXFLAGS += ${INCLUDES}
+
arch.SRCS = boot.S init.s \
gdt.c lgdt.c \
lidt.c isr.c
-arch.OBJS = include
include ../rules.mk
diff --git a/i686/boot.S b/i686/boot.S
index 16d54a3..1eea9a3 100644
--- a/i686/boot.S
+++ b/i686/boot.S
@@ -1,5 +1,5 @@
#define ASM_FILE
-#include <grub/multiboot2.h>
+#include <multiboot2.h>
#include "macros.s"
/* Declare a multiboot header that marks this program as a kernel */