# 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
-LD := ld
+#CC := gcc
+#LD := ld
AS := nasm
DISASM := objdump -d -S
RM := @rm -f
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/RAMDisk
MODULES += Filesystems/Ext2
MODULES += Filesystems/FAT
MODULES += Filesystems/NTFS
-MODULES += IPStack
-DYNMODS := USB/Core
-MODULES += Interfaces/UDI
+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