X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=d8a8e0d4074086f7e6acef74a6e5da2f86653b22;hb=930fe819133ddb444bc6c22df09baf788183f6ad;hp=08cf64d41f89f0df02fece5cade921d167ab9b26;hpb=45f9a29e481ce9ea7ca7121541f0e0f90147f5b1;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 08cf64d4..d8a8e0d4 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,39 +2,66 @@
 # 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)
+
+# 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
+	ARCH := i386
 endif
+-include $(ACESSDIR)/Makefile.$(ARCH).cfg
 ifeq ($(ARCHDIR),)
-	ARCHDIR = x86
+	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
+FILESYSTEMS := 
+DRIVERS := 
+MODULES :=
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
-MODULES += IPStack
-DYNMODS = USB/Core Interfaces/UDI
+MODULES += Filesystems/NTFS
+
+ifeq ($(ARCHDIR),x86)
+MODULES += Storage/ATA Storage/FDD
+MODULES += Network/NE2000 Network/RTL8139
+MODULES += Display/VESA
+MODULES += Display/BochsGA
+MODULES += Interfaces/UDI
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA x86/VGAText
+endif
+
+ifeq ($(ARCHDIR),x86_64)
+MODULES += Storage/ATA Storage/FDD
+MODULES += Network/NE2000 Network/RTL8139
+MODULES += Display/BochsGA
+MODULES += Interfaces/UDI
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA x86/VGAText
+endif
 
-#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