X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Makefile.cfg;h=d14b29c2f55247b0fb768bee97756faaa8f65fc4;hb=2905fecbe9bf464d09d5f2a29cdc8655d7cc0b45;hp=0ccb74adca40febb9e79a42ba9c8f276c15acd49;hpb=4b59aea79be4992af2b1c38ea43f6dacf939d782;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 0ccb74ad..d14b29c2 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -5,14 +5,16 @@
 # Install destination configuration
 DISTROOT := a:/Acess2
 xCP := mcopy -D o
-xMKDIR := mmd
+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,30 +22,41 @@ 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)/BuildConf/$(ARCH)/Makefile.cfg
 ifeq ($(ARCHDIR),)
 	ARCHDIR := x86
 endif
--include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+
+ifneq ($(ARCH),host)
+ ifneq ($(ARCHDIR),$(ARCH))
+  include $(ACESSDIR)/BuildConf/$(ARCHDIR)/Makefile.cfg
+ endif
+endif
+
+ifeq ($(PLATFORM),)
+	PLATFORM := default
+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
-MODULES += Interfaces/UDI
+
+include $(ACESSDIR)/BuildConf/$(ARCH)/$(PLATFORM).mk
+
+MODULES += IPStack	# So the other modules are loaded before it
+#DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD