X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=c980f42ef2d33d880c9c85ae79c67dcce7687bfc;hb=6f4c456fc47a9f470417cdf647473e21fdd848e7;hp=ad972f703ff93b7d8af7e93b9f3c0fc1a008aff9;hpb=3234a52a913609230ffc140c27542d421bb1b7d3;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index ad972f70..c980f42e 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,40 +2,67 @@
 # 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
+# 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 Makefile.$(ARCH).cfg
+-include $(ACESSDIR)/Makefile.$(ARCH).cfg
 ifeq ($(ARCHDIR),)
-	ARCHDIR = x86
+	ARCHDIR := x86
+endif
+ifneq ($(ARCH),host)
+-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
 endif
 
-FILESYSTEMS = 
-DRIVERS = 
-MODULES  = Storage/ATA Storage/FDD
-MODULES += Network/NE2000
-MODULES += Display/VESA
-MODULES += Display/BochsGA
+# 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 :=
 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
+#DYNMODS += Filesystems/InitRD