diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 14 | ||||
| -rw-r--r-- | src/kernel.cpp | 12 | ||||
| -rw-r--r-- | src/mem/vmm.c | 2 | ||||
| -rw-r--r-- | src/mmap.h | 2 |
4 files changed, 13 insertions, 17 deletions
diff --git a/src/Makefile b/src/Makefile index c3e4931..1aa8617 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,11 @@ include ../Makefile.config +INCLUDES := -isystem../grub -I../${ARCH} -I../devices +CFLAGS += ${INCLUDES} +CXXFLAGS += ${INCLUDES} + kernel.SRCS := multiboot2.c mmap.c kernel.cpp mem/vmm.c -kernel.OBJS := include conf.h +kernel.OBJS := conf.h TESTS += tst/test_taskqueue tst/test_roundrobin @@ -13,11 +17,3 @@ conf.h: conf.h.in @sed -i 's/@VERSION@/$(shell git describe)/' conf.h @sed -i 's/@CC@/$(shell ${CC} --version | head -n1)/' conf.h -include: - mkdir -p $@ - ln -sTf ../../grub $@/grub - ln -sTf ../../${ARCH} $@/arch - ln -sTf ../../${ARCH}/sys $@/sys - ln -sTf ../../devices $@/devices - ln -sTf ../../lib $@/lib - diff --git a/src/kernel.cpp b/src/kernel.cpp index 751bcb0..063fe11 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -7,15 +7,15 @@ extern "C" { #include "conf.h" #include "mem.h" -#include <devices/keyboard.h> -#include <devices/mouse.h> -#include <devices/pic.h> -#include <devices/ps2_controller.h> +#include <keyboard.h> +#include <mouse.h> +#include <pic.h> +#include <ps2_controller.h> #include <stdio.h> #include <sys/cpuid.h> } -#include <devices/uart.hpp> -#include <devices/vga.hpp> +#include <uart.hpp> +#include <vga.hpp> FILE *stdin; FILE *stdout; diff --git a/src/mem/vmm.c b/src/mem/vmm.c index 3d34a0a..77b06a8 100644 --- a/src/mem/vmm.c +++ b/src/mem/vmm.c @@ -1,5 +1,5 @@ #include "../mem.h" -#include <arch/paging.h> +#include <paging.h> extern struct DirectoryEntry k_pagedir[1024]; extern struct TableEntry k_ptable0x300[1024]; @@ -1,7 +1,7 @@ #pragma once #include "boot.h" -#include <grub/multiboot2.h> +#include <multiboot2.h> __attribute__((section(".multiboot.text"))) unsigned multiboot2_mmap(const struct multiboot_mmap_entry entries[], unsigned entry_count, unsigned bitmap[1024 * 32]); |