X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2FMakefile;h=8593d6fb643afc0cd1482ea9fa3a18d8fc7d11af;hb=25f19babe7a0ab75d04ff7e6f98f7bcb65fb8941;hp=4cf661ad326c0f9e350ef04a0c240031977b86c6;hpb=79b27f40907a5050a2512d11703ab9bba3f64ec0;p=tpg%2Facess2.git diff --git a/Kernel/Makefile b/Kernel/Makefile index 4cf661ad..8593d6fb 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -15,9 +15,9 @@ KERNEL_VERSION = 0.5 MAKEDEP = $(CC) -M CPPFLAGS += -I./include -I./arch/$(ARCHDIR)/include -CPPFLAGS += -DARCH=$(ARCH) -DKERNEL_VERSION=$(KERNEL_VERSION) -DBUILD_NUM=$(BUILD_NUM) +CPPFLAGS += -DARCH=$(ARCH) -DARCHDIR=$(ARCHDIR) -DKERNEL_VERSION=$(KERNEL_VERSION) -DBUILD_NUM=$(BUILD_NUM) CFLAGS += -Wall -Werror -O3 -fno-stack-protector -fno-builtin -ASFLAGS += -D ARCH=\"$(ARCH)\" +ASFLAGS += -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\" LDFLAGS += -T arch/$(ARCHDIR)/link.ld ifeq ($(DEBUG_BUILD),yes) @@ -27,7 +27,7 @@ endif OBJ = $(addprefix arch/$(ARCHDIR)/,$(A_OBJ)) OBJ += heap.o messages.o debug.o modules.o lib.o syscalls.o system.o threads.o drvutil.o -OBJ += binary.o bin/elf.o +OBJ += binary.o bin/elf.o bin/pe.o OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/dir.o vfs/io.o vfs/mount.o vfs/memfile.o vfs/nodecache.o OBJ += vfs/fs/root.o vfs/fs/devfs.o OBJ += $(addprefix vfs/fs/, $(addsuffix .o,$(FILESYSTEMS))) @@ -84,5 +84,7 @@ include/syscalls.h: syscalls.lst Makefile Makefile: ../Makefile.cfg arch/$(ARCHDIR)/Makefile +drv/proc.o.%: Makefile.BuildNum + # Dependency Files -include $(DEPFILES)