X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=834f9706be5b479c46ac26fc2e9c7ed868e06f11;hb=3681dbf27244ee07ae618a9d33a608ae6089d3c5;hp=da612a94dc645c48c42c901ead6c528ff47cad4b;hpb=7514bb8053931759b99f77d3f9ad70446b0625ac;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index da612a94..834f9706 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,34 +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
 
+# Default build programs
+CC := gcc
+LD := ld
+AS := nasm
+DISASM := objdump -d -S
+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 = fat
-DRIVERS = ata_x86
-MODULES = FS_Ext2 FDD NE2000 BochsGA IPStack
-DYNMODS = USB
-# UDI
-
-#DISTROOT = /mnt/AcessHDD/Acess2
-#DISTROOT = ~/Projects/Acess2/Filesystem
-DISTROOT = a:/Acess2
-ACESSDIR = /home/tpg/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