X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Makefile.cfg;h=8c5b59b9f1ff17a35e8da7759f6c73eac4f0700a;hb=e573d30162c179edc6de7b7c8364a617d9f25f77;hp=65d3fa04ab2c8e13d4529cce13d136c60d770d53;hpb=9d3800f60f2212432e550a4e003ae65b498a4d36;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 65d3fa04..8c5b59b9 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,14 +2,48 @@
 # Acess2 Build Configuration
 #
 
-CC = gcc
-LD = ld
-AS = nasm
-OBJDUMP = objdump
-RM = @rm -f
-STRIP = strip
+# Install destination configuration
+DISTROOT := a:/Acess2
+xCP := mcopy -D o
+xMKDIR := mmd -D s
 
-ARCH = i386
-ARCHDIR = x86
+ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
+ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
 
-DISTROOT = /mnt/AcessHDD/Acess2
+# Default build programs
+CC := gcc
+LD := ld
+AS := nasm
+DISASM := objdump -d -S
+RM := @rm -f
+STRIP := strip
+MKDIR := mkdir -p
+RMDIR := rm -rf
+lCP := cp
+
+# Load Architecture settings
+ifeq ($(ARCH),)
+	ARCH := i386
+endif
+-include $(ACESSDIR)/Makefile.$(ARCH).cfg
+ifeq ($(ARCHDIR),)
+	ARCHDIR := x86
+endif
+-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+
+# Makefile.user.cfg is not part of the Acess git repo,
+# It is for overriding the options in this file
+-include $(ACESSDIR)/Makefile.user.cfg
+
+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