X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2FMakefile;h=0c442882e69979bb48dbc5222d0eab88e413c747;hb=3998cfbbadb005bf3ad52ea2538dc21f82864ddc;hp=335d21958e6db07e177c13aac63097c327fc2350;hpb=8bc40333b1401d7616b225945fee53d972c2f418;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index 335d2195..0c442882 100644
--- a/Kernel/arch/x86/Makefile
+++ b/Kernel/arch/x86/Makefile
@@ -4,15 +4,32 @@
 # arch/i386/Makefile
 
 # Assuming build machine is 32-bit ELF
-CC = gcc
-AS = nasm
-LD = ld
-OBJDUMP = objdump
+#CC = gcc
+#AS = nasm
+#LD = ld
+#OBJDUMP = objdump
 
 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