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
UDI/Tools - Renamed udibuild's src dir to say udibuild
[tpg/acess2.git]
/
Makefile.cfg
diff --git
a/Makefile.cfg
b/Makefile.cfg
index
b0de662
..
022a02e
100644
(file)
--- a/
Makefile.cfg
+++ b/
Makefile.cfg
@@
-2,13
+2,16
@@
# Acess2 Build Configuration
#
# Acess2 Build Configuration
#
+ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
+ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
+
# Install destination configuration
# Install destination configuration
-DISTROOT := a:/Acess2
+DISTROOT := -i $(ACESSDIR)/Acess2.img ::/Acess2
+NCC := $(CC)
xCP := mcopy -D o
xMKDIR := mmd -D s
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
# Default build programs
#CC := gcc
@@
-20,39
+23,51
@@
STRIP := strip
MKDIR := mkdir -p
RMDIR := rm -rf
lCP := cp
MKDIR := mkdir -p
RMDIR := rm -rf
lCP := cp
+ASSUFFIX = asm
+
# Load Architecture settings
ifeq ($(ARCH),)
# Load Architecture settings
ifeq ($(ARCH),)
- ARCH :=
i3
86
+ ARCH :=
x
86
endif
endif
-
-include $(ACESSDIR)/Makefile.$(ARCH)
.cfg
+
include $(ACESSDIR)/BuildConf/$(ARCH)/Makefile
.cfg
ifeq ($(ARCHDIR),)
ARCHDIR := x86
endif
ifeq ($(ARCHDIR),)
ARCHDIR := x86
endif
+
ifneq ($(ARCH),host)
ifneq ($(ARCH),host)
--include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg
+ 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
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 :=
DRIVERS :=
MODULES :=
+
+MODULES += Filesystems/RAMDisk
MODULES += Filesystems/Ext2
MODULES += Filesystems/FAT
MODULES += Filesystems/NTFS
MODULES += Filesystems/Ext2
MODULES += Filesystems/FAT
MODULES += Filesystems/NTFS
+MODULES += Storage/LVM
-ifeq ($(ARCHDIR),x86)
-MODULES += Storage/ATA Storage/FDD
-MODULES += Network/NE2000
-MODULES += Display/VESA
-MODULES += Display/BochsGA
-MODULES += Interfaces/UDI
-MODULES += Input/PS2KbMouse
-MODULES += x86/ISADMA x86/VGAText
-endif
+include $(ACESSDIR)/BuildConf/$(ARCH)/$(PLATFORM).mk
+MODULES += Input/Keyboard Input/Mouse
MODULES += IPStack # So the other modules are loaded before it
MODULES += IPStack # So the other modules are loaded before it
-DYNMODS := USB/Core
+#DYNMODS := USB/Core
+#DYNMODS += Filesystems/InitRD
+
+# BUILD_DIST=y - Install to ./Dist
+ifneq ($(BUILD_DIST),)
+ DISTROOT := $(ACESSDIR)/Dist
+ xCP := cp
+ xMKDIR := mkdir -p
+endif
UCC
git Repository :: git.ucc.asn.au