X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2FMakefile;h=0c442882e69979bb48dbc5222d0eab88e413c747;hb=18b264927674c480481466c40368554fb72f560f;hp=051d126e0d068d04bbbcc90b149c40efaf01848b;hpb=9d3800f60f2212432e550a4e003ae65b498a4d36;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index 051d126e..0c442882 100644
--- a/Kernel/arch/x86/Makefile
+++ b/Kernel/arch/x86/Makefile
@@ -13,6 +13,23 @@ CPPFLAGS	=
 CFLAGS		=
 ASFLAGS		= -f elf
 
+ifeq ($(ARCH),i386)
+	ASFLAGS += -D USE_MP=0 -D USE_PAE=0
+	CPPFLAGS += -DUSE_MP=0 -DUSE_PAE=0
+else
+	ifeq ($(ARCH),i486)
+		ASFLAGS += -D USE_MP=1 -D USE_PAE=0
+		CPPFLAGS += -DUSE_MP=1 -DUSE_PAE=0
+	else
+		ifeq ($(ARCH),i586)
+			ASFLAGS += -D USE_MP=1 -D USE_PAE=1
+			CPPFLAGS += -DUSE_MP=1 -DUSE_PAE=1
+		endif
+	endif
+endif
+	
+
 A_OBJ  = start.ao main.o lib.o desctab.ao errors.o irq.o
 A_OBJ += mm_phys.o mm_virt.o
-A_OBJ += proc.o time.o
+A_OBJ += proc.o proc.ao time.o vm8086.o
+A_OBJ += kpanic.o