X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=d12710cf90852936131825e5ad44055a786b681c;hb=98bd9c0c8985c50c42231c116a4e18fedd47761e;hp=7b0ad8c324ab1ea6835df742dd696dfb09bc787b;hpb=8dcc3e209d0d728565a18c8dca2b0ba220b74a6f;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index 7b0ad8c3..d12710cf 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,20 +2,23 @@
 # Acess2 Build Configuration
 #
 
-# Install destination configuration
-DISTROOT := a:/Acess2
-xCP := mcopy -D o
-xMKDIR := mmd -D s
+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
+
 -include $(ACESSDIR)/Makefile.Version.cfg
 
 # Default build programs
 #CC := gcc
 #LD := ld
-AS := nasm
 DISASM := objdump -d -S
 RM := @rm -f
 STRIP := strip
@@ -34,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
@@ -63,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