X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=c030d4754f09c00385f7b4cf98c141b5a80d9035;hb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;hp=c980f42ef2d33d880c9c85ae79c67dcce7687bfc;hpb=47b68865886bc60aaa3389121040ba1af1089130;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index c980f42e..c030d475 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,13 +2,15 @@
 # Acess2 Build Configuration
 #
 
+ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
+ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
+
 # Install destination configuration
-DISTROOT := a:/Acess2
+DISTROOT := -i $(ACESSDIR)/Acess2.img ::/Acess2
 xCP := mcopy -D o
 xMKDIR := mmd -D s
 
-ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
-ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
+-include $(ACESSDIR)/Makefile.Version.cfg
 
 # Default build programs
 #CC := gcc
@@ -20,49 +22,44 @@ 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
+
 ifneq ($(ARCH),host)
--include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+ 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 :=
+
+MODULES += Filesystems/RAMDisk
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
+MODULES += Storage/LVM
 
-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
+include $(ACESSDIR)/BuildConf/$(ARCH)/$(PLATFORM).mk
 
+MODULES += Input/Keyboard Input/Mouse
 MODULES += IPStack	# So the other modules are loaded before it
-DYNMODS := USB/Core
+#DYNMODS := USB/Core
 #DYNMODS += Filesystems/InitRD