X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=3b1bfd5e7072abaee60dd302eb5559ff55737504;hb=1081538c9f2903bec7ad003ab29fadd06bddc7b8;hp=8c5b59b9f1ff17a35e8da7759f6c73eac4f0700a;hpb=e573d30162c179edc6de7b7c8364a617d9f25f77;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 8c5b59b9..3b1bfd5e 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -10,9 +10,11 @@ xMKDIR := mmd -D s
 ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
 ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
 
+-include $(ACESSDIR)/Makefile.Version.cfg
+
 # Default build programs
-CC := gcc
-LD := ld
+#CC := gcc
+#LD := ld
 AS := nasm
 DISASM := objdump -d -S
 RM := @rm -f
@@ -20,16 +22,20 @@ STRIP := strip
 MKDIR := mkdir -p
 RMDIR := rm -rf
 lCP := cp
+ASSUFFIX = asm
+
 
 # Load Architecture settings
 ifeq ($(ARCH),)
-	ARCH := i386
+	ARCH := x86
 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
@@ -37,13 +43,41 @@ endif
 
 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
+MODULES += Storage/FDDv2
+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
+MODULES += Storage/FDDv2
+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
+MODULES += armv7/GIC
+MODULES += Filesystems/InitRD
+MODULES += Display/PL110
+endif
+
+MODULES += IPStack	# So the other modules are loaded before it
+#DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD