Fixed `make install` issues, bugs with VESA

[tpg/acess2.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index 405a4fc..0ccb74a 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,22 +2,24 @@
 # Acess2 Build Configuration
 #
 
-# Source and destination configuration
+# Install destination configuration
 DISTROOT := a:/Acess2
-ACESSDIR := /home/tpg/Projects/Acess2
+xCP := mcopy -D o
+xMKDIR := mmd
+
+ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
+ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
 
 # Default build programs
 CC := gcc
 LD := ld
 AS := nasm
-OBJDUMP := objdump
+DISASM := objdump -d -S
 RM := @rm -f
 STRIP := strip
-MKDIR := mkdir
+MKDIR := mkdir -p
 RMDIR := rm -rf
 lCP := cp
-xCP := mcopy -D o
-xMKDIR := mmd
 
 # Load Architecture settings
 ifeq ($(ARCH),)
@@ -29,13 +31,19 @@ ifeq ($(ARCHDIR),)
 endif
 -include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
 
+# 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 += Display/BochsGA
 MODULES += Filesystems/Ext2
 MODULES += Filesystems/FAT
+MODULES += Filesystems/NTFS
 MODULES += IPStack
-DYNMODS := USB/Core Interfaces/UDI
+DYNMODS := USB/Core
+MODULES += Interfaces/UDI