diff options
Diffstat (limited to 'Kernel/Makefile')
| -rw-r--r-- | Kernel/Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Kernel/Makefile b/Kernel/Makefile index ad506f2f19..856284a36d 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -1,4 +1,4 @@ -OBJS = \ +KERNEL_OBJS = \ _start.o \ init.o \ VGA.o \ @@ -18,7 +18,14 @@ OBJS = \ panel.o \ Disk.o \ fs.o \ - Userspace.o + Userspace.o \ + IDEDiskDevice.o + +VFS_OBJS = \ + ../VirtualFileSystem/DiskDevice.o + +OBJS = $(KERNEL_OBJS) $(VFS_OBJS) + NASM = nasm KERNEL = kernel BOOTLOADER = Boot/boot.bin @@ -30,8 +37,11 @@ WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings FLAVOR_FLAGS = -fomit-frame-pointer -mregparm=3 -march=i386 -m32 -fno-exceptions -fno-rtti -ffunction-sections -fdata-sections -fmerge-all-constants -fno-unroll-loops -falign-functions=1 -falign-jumps=1 -falign-loops=1 #FLAVOR_FLAGS = -fomit-frame-pointer -mregparm=3 -march=i386 -m32 -fno-exceptions -fno-rtti -ffunction-sections -fdata-sections OPTIMIZATION_FLAGS = -Os -fno-asynchronous-unwind-tables -INCLUDE_FLAGS = -Iinclude/ -I. -CXXFLAGS = $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(KERNEL_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) +INCLUDE_FLAGS = -I.. -I. + +DEFINES = -DSERENITY_KERNEL -DSANITIZE_PTRS + +CXXFLAGS = $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(KERNEL_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) #CXX = /usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-g++ #LD = /usr/local/gcc-4.8.1-for-linux64/bin/x86_64-pc-linux-ld CXX = g++ |