X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=174f896aab2849c9bc63102ba58157df5a1e9ebc;hb=97543cda6aae8493252760f0c6e44d3624fa3121;hp=b2957a0d913ef24f6d798da44b6f2a533f0bb690;hpb=4f80abddbbc0e7237b0de6f150da4b8b43fbe499;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index b2957a0d..174f896a 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,41 +2,74 @@
 # Acess2 Build Configuration
 #
 
-# Source and destination configuration
+# Install destination configuration
 DISTROOT := a:/Acess2
-ACESSDIR := /home/tpg/Projects/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
+#CC := gcc
+#LD := ld
 AS := nasm
-OBJDUMP := objdump
+DISASM := objdump -d -S
 RM := @rm -f
 STRIP := strip
-MKDIR := mkdir
+MKDIR := mkdir -p
 RMDIR := rm -rf
 lCP := cp
-xCP := mcopy -D o
-xMKDIR := mmd
+
 
 # Load Architecture settings
 ifeq ($(ARCH),)
 	ARCH := i386
 endif
--include $(ACESSDIR)/Makefile.$(ARCH).cfg
+include $(ACESSDIR)/Makefile.$(ARCH).cfg
 ifeq ($(ARCHDIR),)
 	ARCHDIR := x86
 endif
--include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+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 :=
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
-MODULES += IPStack
-DYNMODS := USB/Core
+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
+MODULES += USB/Core
+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
+MODULES += USB/Core
+endif
+
+ifeq ($(ARCHDIR),armv7)
+MODULES += Input/PS2KbMouse
+endif
+
+MODULES += IPStack	# So the other modules are loaded before it
+#DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD