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
Modules/VGA - Start on a generic VGA driver (VGA driver, and library for derivatives)
[tpg/acess2.git]
/
Makefile.cfg
diff --git
a/Makefile.cfg
b/Makefile.cfg
index
7b0ad8c
..
1eedf8e
100644
(file)
--- a/
Makefile.cfg
+++ b/
Makefile.cfg
@@
-2,14
+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)
+NCXX := $(CXX)
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
-include $(ACESSDIR)/Makefile.Version.cfg
# Default build programs
@@
-34,12
+36,23
@@
ifeq ($(ARCHDIR),)
ARCHDIR := x86
endif
ARCHDIR := x86
endif
+# Default compilers
+ifneq ($(ARCHDIR),native)
+CC = $(COMPILERDIR)bin/$(TRIPLET)-gcc
+CXX = $(COMPILERDIR)bin/$(TRIPLET)-g++
+LD = $(COMPILERDIR)bin/$(TRIPLET)-ld
+OBJDUMP = $(COMPILERDIR)bin/$(TRIPLET)-objdump
+endif
+
ifneq ($(ARCH),host)
ifneq ($(ARCHDIR),$(ARCH))
include $(ACESSDIR)/BuildConf/$(ARCHDIR)/Makefile.cfg
endif
endif
ifneq ($(ARCH),host)
ifneq ($(ARCHDIR),$(ARCH))
include $(ACESSDIR)/BuildConf/$(ARCHDIR)/Makefile.cfg
endif
endif
+COMPILERDIR := $(ACESSDIR)/Externals/Output/$(ARCHDIR)-BUILD/
+PATH := $(COMPILERDIR)bin/ $(PATH)
+
ifeq ($(PLATFORM),)
PLATFORM := default
endif
ifeq ($(PLATFORM),)
PLATFORM := default
endif
@@
-63,3
+76,10
@@
MODULES += Input/Keyboard Input/Mouse
MODULES += IPStack # So the other modules are loaded before it
#DYNMODS := USB/Core
#DYNMODS += Filesystems/InitRD
MODULES += IPStack # So the other modules are loaded before it
#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