X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=022a02ef573eb705a4711817ffb39f28f401e64a;hb=384befc18f81f42d2dd6e324a35904ad037b3af7;hp=4155f5e8b5cc414a7466e90fc86c07ef16804213;hpb=3764c294f21229bdf700f436fa4884f5e76e0d3a;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 4155f5e8..022a02ef 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,13 +2,16 @@
 # 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
+NCC := $(CC)
 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,34 +23,51 @@ 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 := Storage/ATA Storage/FDD
-MODULES += Network/NE2000
-MODULES += Display/VESA
-MODULES += Display/BochsGA
+MODULES :=
+
+MODULES += Filesystems/RAMDisk
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
-MODULES += IPStack
-DYNMODS := USB/Core
-MODULES += Interfaces/UDI
-MODULES += Input/PS2KbMouse
-MODULES += x86/ISADMA
+MODULES += Storage/LVM
+
+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 += Filesystems/InitRD
+
+# BUILD_DIST=y - Install to ./Dist
+ifneq ($(BUILD_DIST),)
+	DISTROOT := $(ACESSDIR)/Dist
+	xCP := cp
+	xMKDIR := mkdir -p
+endif