X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=d12710cf90852936131825e5ad44055a786b681c;hb=6274aaa8894e14462a36c69090e2f9235f130e31;hp=3ec9975e0f3bf67edc68f4baeca114fb8ba9b50b;hpb=2103edc7b67600818930793851b57e3583f73954;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 3ec9975e..d12710cf 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,12 +2,15 @@
 # Acess2 Build Configuration
 #
 
+V ?= @
+
 ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
 ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
 
 # Install destination configuration
 DISTROOT := -i $(ACESSDIR)/Acess2.img ::/Acess2
 NCC := $(CC)
+NCXX := $(CXX)
 xCP := mcopy -D o
 xMKDIR := mmd -D s
 
@@ -16,7 +19,6 @@ xMKDIR := mmd -D s
 # Default build programs
 #CC := gcc
 #LD := ld
-AS := nasm
 DISASM := objdump -d -S
 RM := @rm -f
 STRIP := strip
@@ -35,12 +37,26 @@ ifeq ($(ARCHDIR),)
 	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
+ ifeq ($(AS),as)
+  AS = $(COMPILERDIR)bin/$(TRIPLET)-gcc -c
+ 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
@@ -64,3 +80,10 @@ MODULES += Input/Keyboard Input/Mouse
 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