X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=c980f42ef2d33d880c9c85ae79c67dcce7687bfc;hb=71b1271511ad01f042d2e51673dd57cce1b0fd9c;hp=a2e7ccb0687644155f979832619cf86d3d802b9e;hpb=bfa331e20d9dd6fc0b453dad57b3de0d98765221;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index a2e7ccb0..c980f42e 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,22 +2,24 @@
 # 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
-DISASM := objdump -d
+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),)
@@ -27,17 +29,40 @@ endif
 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 :=
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
-MODULES += IPStack
-DYNMODS := USB/Core
+
+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
+
+MODULES += IPStack	# So the other modules are loaded before it
+DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD