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
Networking - Heaps of changes
[tpg/acess2.git]
/
Makefile.cfg
diff --git
a/Makefile.cfg
b/Makefile.cfg
index
0ccb74a
..
dab99ec
100644
(file)
--- a/
Makefile.cfg
+++ b/
Makefile.cfg
@@
-5,14
+5,14
@@
# Install destination configuration
DISTROOT := a:/Acess2
xCP := mcopy -D o
# Install destination configuration
DISTROOT := a:/Acess2
xCP := mcopy -D o
-xMKDIR := mmd
+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
@@
-29,7
+29,9
@@
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
# Makefile.user.cfg is not part of the Acess git repo,
# It is for overriding the options in this file
@@
-37,13
+39,20
@@
endif
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 += Filesystems/Ext2
MODULES += Filesystems/FAT
MODULES += Filesystems/NTFS
-MODULES += IPStack
-DYNMODS := USB/Core
+
+ifeq ($(ARCHDIR),x86)
+MODULES += Storage/ATA Storage/FDD
+MODULES += Network/NE2000 Network/RTL8139
+MODULES += Display/VESA
+MODULES += Display/BochsGA
MODULES += Interfaces/UDI
MODULES += Interfaces/UDI
+MODULES += Input/PS2KbMouse
+MODULES += x86/ISADMA x86/VGAText
+endif
+
+MODULES += IPStack # So the other modules are loaded before it
+DYNMODS := USB/Core
UCC
git Repository :: git.ucc.asn.au