git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IPStack - Bugfixing (and testing IRC client)
[tpg/acess2.git]
/
Makefile.cfg
diff --git
a/Makefile.cfg
b/Makefile.cfg
index
348206f
..
0ccb74a
100644
(file)
--- a/
Makefile.cfg
+++ b/
Makefile.cfg
@@
-2,37
+2,48
@@
# Acess2 Build Configuration
#
# Acess2 Build Configuration
#
-CC = gcc
-LD = ld
-AS = nasm
-OBJDUMP = objdump
-RM = @rm -f
-STRIP = strip
-MKDIR = mkdir
-RMDIR = rm -rf
-lCP = cp
-xCP = mcopy -D o
-xMKDIR = mmd
-xRMDIR = mdeltree
-xRM = mdel
+# Install destination configuration
+DISTROOT := a:/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
+DISASM := objdump -d -S
+RM := @rm -f
+STRIP := strip
+MKDIR := mkdir -p
+RMDIR := rm -rf
+lCP := cp
+
+# Load Architecture settings
ifeq ($(ARCH),)
ifeq ($(ARCH),)
- ARCH = i386
+ ARCH
:
= i386
endif
endif
+-include $(ACESSDIR)/Makefile.$(ARCH).cfg
ifeq ($(ARCHDIR),)
ifeq ($(ARCHDIR),)
- ARCHDIR = x86
+ ARCHDIR
:
= x86
endif
endif
+-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
-FILESYSTEMS = fat
-DRIVERS =
-MODULES = Storage/ATA Storage/FDD
+# 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 += Network/NE2000
-MODULES += Display/BochsGA
-MODULES += Filesystems/FS_Ext2
+MODULES += Display/VESA
+#MODULES += Display/BochsGA
+MODULES += Filesystems/Ext2
+MODULES += Filesystems/FAT
+MODULES += Filesystems/NTFS
MODULES += IPStack
MODULES += IPStack
-DYNMODS = USB Interfaces/UDI
-
-#DISTROOT = /mnt/AcessHDD/Acess2
-#DISTROOT = ~/Projects/Acess2/Filesystem
-DISTROOT = a:/Acess2
-ACESSDIR = /home/tpg/Projects/Acess2
+DYNMODS := USB/Core
+MODULES += Interfaces/UDI
UCC
git Repository :: git.ucc.asn.au