X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=3ec9975e0f3bf67edc68f4baeca114fb8ba9b50b;hb=c34752b7ccc945a70a2d9b1e505aa4a4de43163b;hp=17524975b7e439b7abf75dd5b2e47bbb664626e2;hpb=95a7eaaa4a1065334125b65130866f8d1048ddb7;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 17524975..3ec9975e 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,21 +2,65 @@
 # Acess2 Build Configuration
 #
 
-CC = gcc
-LD = ld
-AS = nasm
-OBJDUMP = objdump
-RM = @rm -f
-STRIP = strip
-MKDIR = mkdir
-RMDIR = rm -rf
-
-ARCH = i386
-ARCHDIR = x86
-
-FILESYSTEMS = fat ext2
-DRIVERS = ata_x86 fdd
-MODULES = NE2000 BochsVBE
-
-DISTROOT = /mnt/AcessHDD/Acess2
-ACESSDIR = /home/hodgeja/Projects/Acess2
+ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
+ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
+
+# Install destination configuration
+DISTROOT := -i $(ACESSDIR)/Acess2.img ::/Acess2
+NCC := $(CC)
+xCP := mcopy -D o
+xMKDIR := mmd -D s
+
+-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 := x86
+endif
+include $(ACESSDIR)/BuildConf/$(ARCH)/Makefile.cfg
+ifeq ($(ARCHDIR),)
+	ARCHDIR := x86
+endif
+
+ifneq ($(ARCH),host)
+ ifneq ($(ARCHDIR),$(ARCH))
+  include $(ACESSDIR)/BuildConf/$(ARCHDIR)/Makefile.cfg
+ endif
+endif
+
+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/RAMDisk
+MODULES += Filesystems/Ext2
+MODULES += Filesystems/FAT
+MODULES += Filesystems/NTFS
+MODULES += Storage/LVM
+
+include $(ACESSDIR)/BuildConf/$(ARCH)/$(PLATFORM).mk
+
+MODULES += Input/Keyboard Input/Mouse
+MODULES += IPStack	# So the other modules are loaded before it
+#DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD