X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Farch%2Fx86%2FMakefile;h=10cd645b6c7bd0c874df5961a6777501f0113ee4;hb=dcebc16c576aa98eb6a33047f4c4b2b69b30a1bc;hp=335d21958e6db07e177c13aac63097c327fc2350;hpb=8bc40333b1401d7616b225945fee53d972c2f418;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index 335d2195..10cd645b 100644
--- a/Kernel/arch/x86/Makefile
+++ b/Kernel/arch/x86/Makefile
@@ -3,16 +3,25 @@
 # i386 Architecture Makefile
 # arch/i386/Makefile
 
-# Assuming build machine is 32-bit ELF
-CC = gcc
-AS = nasm
-LD = ld
-OBJDUMP = objdump
+AS_SUFFIX = asm
 
 CPPFLAGS	=
 CFLAGS		=
 ASFLAGS		= -f elf
 
+USE_MP=0
+
+ifeq ($(ARCH),x86)
+	USE_MP=0
+else ifeq ($(ARCH),x86-smp)
+	USE_MP=1
+endif
+
+#ASFLAGS		+= -D ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
+ASFLAGS += -D USE_MP=$(USE_MP)
+CPPFLAGS += -DUSE_MP=$(USE_MP)
+
 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 pci.o