Fixed Video_DrawText passing too many arguments to _SysDebug

[tpg/acess2.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index 1752497..547f1bb 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,21 +2,44 @@
 # Acess2 Build Configuration
 #
 
-CC = gcc
-LD = ld
-AS = nasm
-OBJDUMP = objdump
-RM = @rm -f
-STRIP = strip
-MKDIR = mkdir
-RMDIR = rm -rf
+# Source and destination configuration
+DISTROOT := a:/Acess2
 
-ARCH = i386
-ARCHDIR = x86
+ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
+ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
 
-FILESYSTEMS = fat ext2
-DRIVERS = ata_x86 fdd
-MODULES = NE2000 BochsVBE
+# Default build programs
+CC := gcc
+LD := ld
+AS := nasm
+DISASM := objdump -d -S
+RM := @rm -f
+STRIP := strip
+MKDIR := mkdir
+RMDIR := rm -rf
+lCP := cp
+xCP := mcopy -D o
+xMKDIR := mmd
 
-DISTROOT = /mnt/AcessHDD/Acess2
-ACESSDIR = /home/hodgeja/Projects/Acess2
+# Load Architecture settings
+ifeq ($(ARCH),)
+       ARCH := i386
+endif
+-include $(ACESSDIR)/Makefile.$(ARCH).cfg
+ifeq ($(ARCHDIR),)
+       ARCHDIR := x86
+endif
+-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+
+FILESYSTEMS := 
+DRIVERS := 
+MODULES := Storage/ATA Storage/FDD
+MODULES += Network/NE2000
+MODULES += Display/VESA
+#MODULES += Display/BochsGA
+MODULES += Filesystems/Ext2
+MODULES += Filesystems/FAT
+MODULES += Filesystems/NTFS
+MODULES += IPStack
+DYNMODS := USB/Core
+MODULES += Interfaces/UDI