X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=d14b29c2f55247b0fb768bee97756faaa8f65fc4;hb=2905fecbe9bf464d09d5f2a29cdc8655d7cc0b45;hp=a12ea15191b17cf764c37f60b9b07ee3042aa88b;hpb=923a9dc473851ec2bb1c94021bbf139724e7e8a5;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index a12ea151..d14b29c2 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,38 +2,61 @@
 # 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
+# Install destination configuration
+DISTROOT := a:/Acess2
+xCP := mcopy -D o
+xMKDIR := mmd -D s
 
+ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
+ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
+
+-include $(ACESSDIR)/Makefile.Version.cfg
+
+# 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
+ASSUFFIX = asm
+
+
+# Load Architecture settings
 ifeq ($(ARCH),)
-	ARCH = i386
+	ARCH := x86
 endif
+include $(ACESSDIR)/BuildConf/$(ARCH)/Makefile.cfg
 ifeq ($(ARCHDIR),)
-	ARCHDIR = x86
+	ARCHDIR := x86
+endif
+
+ifneq ($(ARCH),host)
+ ifneq ($(ARCHDIR),$(ARCH))
+  include $(ACESSDIR)/BuildConf/$(ARCHDIR)/Makefile.cfg
+ endif
 endif
 
-FILESYSTEMS = 
-DRIVERS = 
-MODULES  = Storage/ATA Storage/FDD
-MODULES += Network/NE2000
-MODULES += Display/BochsGA
+ifeq ($(PLATFORM),)
+	PLATFORM := default
+endif
+
+# 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
+
+DRIVERS := 
+MODULES :=
+
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
-MODULES += IPStack
-DYNMODS = USB Interfaces/UDI
+MODULES += Filesystems/NTFS
+
+include $(ACESSDIR)/BuildConf/$(ARCH)/$(PLATFORM).mk
 
-#DISTROOT = /mnt/AcessHDD/Acess2
-#DISTROOT = ~/Projects/Acess2/Filesystem
-DISTROOT = a:/Acess2
-ACESSDIR = /home/tpg/Projects/Acess2
+MODULES += IPStack	# So the other modules are loaded before it
+#DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD