X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=35080e9c5f3f705afa9abbd28e15c6666f660e6c;hb=6252604e648b1e887dfa2256d76cfb278b968841;hp=e4ae222e07243aafe06d3a499d4c4f9d724f631f;hpb=872dbea3900b09c78092d3cdf035513f400bcfe8;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index e4ae222e..35080e9c 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,38 +2,41 @@
 # Acess2 Build Configuration
 #
 
-CC = gcc
-LD = ld
-AS = nasm
-OBJDUMP = objdump
-RM = @rm -f
-STRIP = strip
-MKDIR = mkdir
-RMDIR = rm -rf
-lCP = cp
-xCP = mcopy -D o
-xMKDIR = mmd
-xRMDIR = mdeltree
-xRM = mdel
+# Source and destination configuration
+DISTROOT := a:/Acess2
+ACESSDIR := /home/tpg/Projects/Acess2
 
+# Default build programs
+CC := gcc
+LD := ld
+AS := nasm
+OBJDUMP := objdump
+RM := @rm -f
+STRIP := strip
+MKDIR := mkdir
+RMDIR := rm -rf
+lCP := cp
+xCP := mcopy -D o
+xMKDIR := mmd
+
+# Load Architecture settings
 ifeq ($(ARCH),)
-	ARCH = i386
+	ARCH := i386
 endif
+-include $(ACESSDIR)/Makefile.$(ARCH).cfg
 ifeq ($(ARCHDIR),)
-	ARCHDIR = x86
+	ARCHDIR := x86
 endif
+-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
 
-FILESYSTEMS = 
-DRIVERS = 
-MODULES  = Storage/ATA Storage/FDD
+FILESYSTEMS := 
+DRIVERS := 
+MODULES := Storage/ATA Storage/FDD
 MODULES += Network/NE2000
-#MODULES += Display/BochsGA
+MODULES += Display/VESA
+MODULES += Display/BochsGA
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
 MODULES += IPStack
-DYNMODS = USB Interfaces/UDI
-
-#DISTROOT = /mnt/AcessHDD/Acess2
-#DISTROOT = ~/Projects/Acess2/Filesystem
-DISTROOT = a:/Acess2
-ACESSDIR = /home/tpg/Projects/Acess2
+DYNMODS := USB/Core
+MODULES += Interfaces/UDI