X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=a2e7ccb0687644155f979832619cf86d3d802b9e;hb=586a47ab9343a85c944a2cf7b27a74cf459a8423;hp=441718cb82cbded3b0163567ceb15fc4e937a926;hpb=4c846dc6c5b4e8bc39f1ecc3370db690400b40e2;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 441718cb..a2e7ccb0 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,28 +2,42 @@
 # 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
 
-ARCH = i386
-ARCHDIR = x86
+# Default build programs
+CC := gcc
+LD := ld
+AS := nasm
+DISASM := objdump -d
+RM := @rm -f
+STRIP := strip
+MKDIR := mkdir
+RMDIR := rm -rf
+lCP := cp
+xCP := mcopy -D o
+xMKDIR := mmd
 
-FILESYSTEMS = fat
-DRIVERS = ata_x86
-MODULES = FS_Ext2 FDD NE2000 BochsGA
+# Load Architecture settings
+ifeq ($(ARCH),)
+	ARCH := i386
+endif
+-include $(ACESSDIR)/Makefile.$(ARCH).cfg
+ifeq ($(ARCHDIR),)
+	ARCHDIR := x86
+endif
+-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
 
-#DISTROOT = /mnt/AcessHDD/Acess2
-#DISTROOT = ~/Projects/Acess2/Filesystem
-DISTROOT = a:/Acess2
-ACESSDIR = /home/hodgeja/Projects/Acess2
+FILESYSTEMS := 
+DRIVERS := 
+MODULES := Storage/ATA Storage/FDD
+MODULES += Network/NE2000
+MODULES += Display/VESA
+#MODULES += Display/BochsGA
+MODULES += Filesystems/Ext2
+MODULES += Filesystems/FAT
+MODULES += Filesystems/NTFS
+MODULES += IPStack
+DYNMODS := USB/Core
+MODULES += Interfaces/UDI