Merge branch 'master' of git://cadel.mutabah.net/acess2

[tpg/acess2.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index 1eedf8e..d12710c 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,6 +2,8 @@
 # Acess2 Build Configuration
 #
 
+V ?= @
+
 ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
 ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
 
@@ -17,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
@@ -42,6 +43,9 @@ 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)