X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Makefile.cfg;h=ff49c162a2ecb1a38f2f896acb5f127504d6f50c;hb=cafb65b48663d2851ed4330b4731c20f9b2bfaae;hp=38f03de416eb7e5b5dc0313a30cc9c105c1c9e13;hpb=c97bc2de4c735bba63f29e8344652ef0634c5288;p=tpg%2Facess2.git diff --git a/Makefile.cfg b/Makefile.cfg index 38f03de4..ff49c162 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -2,23 +2,24 @@ # Acess2 Build Configuration # -# Source and destination configuration +# Install destination configuration DISTROOT := a:/Acess2 -#ACESSDIR := /home/tpg/Projects/Acess2 +xCP := mcopy -D o +xMKDIR := mmd -D s + 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 STRIP := strip -MKDIR := mkdir +MKDIR := mkdir -p RMDIR := rm -rf lCP := cp -xCP := mcopy -D o -xMKDIR := mmd # Load Architecture settings ifeq ($(ARCH),) @@ -28,7 +29,13 @@ endif ifeq ($(ARCHDIR),) ARCHDIR := x86 endif +ifneq ($(ARCH),host) -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 :=