X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=834f9706be5b479c46ac26fc2e9c7ed868e06f11;hb=01fbfb424865291e00242681662ed9b20c33a524;hp=3451f90ee5c04f9e0bd604ed803881d439de8920;hpb=e266c901ab2bd1b7b249a80b5a556e6f7cbb34ba;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 3451f90e..834f9706 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,39 +2,42 @@
 # Acess2 Build Configuration
 #
 
-CC = i586-elf-gcc
-LD = i586-elf-ld
-AS = nasm
-OBJDUMP = i586-elf-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 = 
-DRIVERS = 
-MODULES  = Storage/ATA Storage/FDD
+FILESYSTEMS := 
+DRIVERS := 
+MODULES := Storage/ATA Storage/FDD
 MODULES += Network/NE2000
 MODULES += Display/VESA
-MODULES += Display/BochsGA
+#MODULES += Display/BochsGA
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
+MODULES += Filesystems/NTFS
 MODULES += IPStack
-DYNMODS = USB/Core Interfaces/UDI
-
-#DISTROOT = /mnt/AcessHDD/Acess2
-#DISTROOT = ~/Projects/Acess2/Filesystem
-DISTROOT = a:/Acess2
-ACESSDIR = /home/tpg/Projects/Acess2
+DYNMODS := USB/Core
+MODULES += Interfaces/UDI