From dbb6c113130adc59b23d92ff38a2e02cb1d71e2f Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 30 Jan 2016 08:11:57 +0100 Subject: makefile should inherit CC and GCC if set in parent makefile (nw) --- src/devices/cpu/m68000/makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/devices/cpu/m68000') diff --git a/src/devices/cpu/m68000/makefile b/src/devices/cpu/m68000/makefile index fbf49c6ce0e..be25a067a78 100644 --- a/src/devices/cpu/m68000/makefile +++ b/src/devices/cpu/m68000/makefile @@ -8,6 +8,12 @@ ifeq ($(OS),os2) EXE := .exe endif +ifndef verbose + SILENT = @ +endif +CC = gcc +CXX = g++ + .PHONY: all clean all : m68kmake$(EXE) m68kops.cpp @@ -19,13 +25,13 @@ clean: -@rm -f m68kops.* m68kmake.o: m68kmake.cpp - @gcc -x c++ -std=c++11 -o "$@" -c "$<" + $(SILENT) $(CC) -x c++ -std=c++11 -o "$@" -c "$<" m68kmake$(EXE) : m68kmake.o @echo Linking $@... - @g++ -lstdc++ $^ -o $@ + $(SILENT) $(CXX) -lstdc++ $^ -o $@ m68kops.cpp: m68kmake$(EXE) m68k_in.cpp @echo Generating M68K source files... - @./m68kmake$(EXE) . m68k_in.cpp + $(SILENT) ./m68kmake$(EXE) . m68k_in.cpp -- cgit v1.2.3-70-g09d2