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
AxWin2 - Huge changes, getting to the working point
[tpg/acess2.git]
/
Makefile.cfg
diff --git
a/Makefile.cfg
b/Makefile.cfg
index
8308829
..
96c783e
100644
(file)
--- a/
Makefile.cfg
+++ b/
Makefile.cfg
@@
-2,15
+2,17
@@
# Acess2 Build Configuration
#
# Acess2 Build Configuration
#
-#
Source and
destination configuration
+#
Install
destination configuration
DISTROOT := a:/Acess2
DISTROOT := a:/Acess2
+xCP := mcopy -D o
+xMKDIR := mmd -D s
ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
# Default build programs
ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
# Default build programs
-CC := gcc
-LD := ld
+
#
CC := gcc
+
#
LD := ld
AS := nasm
DISASM := objdump -d -S
RM := @rm -f
AS := nasm
DISASM := objdump -d -S
RM := @rm -f
@@
-18,8
+20,6
@@
STRIP := strip
MKDIR := mkdir -p
RMDIR := rm -rf
lCP := cp
MKDIR := mkdir -p
RMDIR := rm -rf
lCP := cp
-xCP := mcopy -D o
-xMKDIR := mmd
# Load Architecture settings
ifeq ($(ARCH),)
# Load Architecture settings
ifeq ($(ARCH),)
@@
-29,17
+29,30
@@
endif
ifeq ($(ARCHDIR),)
ARCHDIR := x86
endif
ifeq ($(ARCHDIR),)
ARCHDIR := x86
endif
+ifneq ($(ARCH),host)
-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
-include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+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 :=
FILESYSTEMS :=
DRIVERS :=
-MODULES := Storage/ATA Storage/FDD
-MODULES += Network/NE2000
-MODULES += Display/VESA
-#MODULES += Display/BochsGA
+MODULES :=
MODULES += Filesystems/Ext2
MODULES += Filesystems/FAT
MODULES += Filesystems/NTFS
MODULES += IPStack
MODULES += Filesystems/Ext2
MODULES += Filesystems/FAT
MODULES += Filesystems/NTFS
MODULES += IPStack
-DYNMODS := USB/Core
+
+ifeq ($(ARCHDIR),x86)
+MODULES += Storage/ATA Storage/FDD
+MODULES += Network/NE2000
+MODULES += Display/VESA
+MODULES += Display/BochsGA
MODULES += Interfaces/UDI
MODULES += Interfaces/UDI
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA x86/VGAText
+endif
+
+DYNMODS := USB/Core
UCC
git Repository :: git.ucc.asn.au