-#DISTROOT = /mnt/AcessHDD/Acess2
-DISTROOT = ~/Projects/Acess2/Filesystem
-ACESSDIR = ~/Projects/Acess2
+# Load Architecture settings
+ifeq ($(ARCH),)
+ ARCH := i386
+endif
+-include $(ACESSDIR)/Makefile.$(ARCH).cfg
+ifeq ($(ARCHDIR),)
+ ARCHDIR := x86
+endif
+ifneq ($(ARCH),host)
+-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+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
+
+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