X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fm68000%2FMakefile;h=16ed1594a52886fa89e041c2e672b546cb8140ec;hb=0d7e70c5e34e691b15365901951700f43242065f;hp=430943b951222ff9a3e6f212449ed269ca46bea7;hpb=d848a84a9c3a134b434025f28c9bf567a48bd94b;p=virtualjaguar

diff --git a/src/m68000/Makefile b/src/m68000/Makefile
index 430943b..16ed159 100644
--- a/src/m68000/Makefile
+++ b/src/m68000/Makefile
@@ -7,20 +7,23 @@
 # This makefile is released under the GPLv3 or later
 #
 
+ifeq ("$(V)","1")
+Q :=
+else
+Q := @
+endif
+
 # Cross compilation using MXE
 #CROSS = i686-pc-mingw32-
 
 CC      := $(CROSS)gcc
 LD      := $(CROSS)gcc
 AR      := $(CROSS)ar
-ARFLAGS := -rs
+HOSTCC  := gcc
 
-# Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
-#CFLAGS  := -MMD -O2 -ffast-math -fomit-frame-pointer -g
-CFLAGS  ?= -O2 -ffast-math -fomit-frame-pointer -g
+ARFLAGS := -rs
 GCC_DEPS = -MMD
-
-INCS    := -I. -I./obj `sdl-config --cflags`
+INCS    := -I. -I./obj `$(CROSS)sdl-config --cflags`
 
 OBJS = \
 	obj/cpustbl.o \
@@ -39,7 +42,7 @@ all: obj obj/libm68k.a
 
 # Library rules (might not be cross-platform compatible)
 obj/libm68k.a: $(OBJS)
-	@$(AR) $(ARFLAGS) obj/libm68k.a $(OBJS)
+	$(Q)$(AR) $(ARFLAGS) obj/libm68k.a $(OBJS)
 
 obj:
 	@mkdir ./obj
@@ -48,13 +51,11 @@ obj:
 
 obj/%.o: %.c
 	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-#	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
-	@$(CC) $(GCC_DEPS) $(CFLAGS) $(INCS) -c $< -o $@
+	$(Q)$(CC) $(GCC_DEPS) $(CFLAGS) $(INCS) -c $< -o $@
 
 obj/%.o: obj/%.c
 	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-#	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
-	@$(CC) $(GCC_DEPS) $(CFLAGS) $(INCS) -c $< -o $@
+	$(Q)$(CC) $(GCC_DEPS) $(CFLAGS) $(INCS) -c $< -o $@
 
 # Generated code
 
@@ -65,22 +66,19 @@ obj/cpustbl.c: obj/gencpu
 
 obj/gencpu: obj/cpudefs.c
 	@echo -e "\033[01;33m***\033[00;32m Generating gencpu...\033[00m"
-#	@$(CC) $(GCC_DEPS) $(CFLAGS) gencpu.c readcpu.c obj/cpudefs.c -o obj/gencpu -I. -I./obj
-	@gcc $(GCC_DEPS) $(CFLAGS) gencpu.c readcpu.c obj/cpudefs.c -o obj/gencpu -I. -I./obj
+	$(Q)$(HOSTCC) $(GCC_DEPS) $(CFLAGS) gencpu.c readcpu.c obj/cpudefs.c -o obj/gencpu -I. -I./obj
 
 obj/cpudefs.c: obj/build68k
 	@echo -e "\033[01;33m***\033[00;32m Generating cpudefs.c...\033[00m"
-	@obj/build68k < table68k > obj/cpudefs.c
+	$(Q)obj/build68k < table68k > obj/cpudefs.c
 
 obj/build68k: build68k.c
-	@echo -e "\033[01;33m***\033[00;32m Compiling build68k.c...\033[00m"
-#	@$(CC) $(GCC_DEPS) $(CFLAGS) build68k.c -o obj/build68k
-	@gcc $(GCC_DEPS) $(CFLAGS) build68k.c -o obj/build68k
+	@echo -e "\033[01;33m***\033[00;32m Compiling $< ...\033[00m"
+	$(Q)$(HOSTCC) $(GCC_DEPS) $(CFLAGS) build68k.c -o obj/build68k
 
 clean:
 	@echo -ne "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
 	@-rm -rf ./obj
-#	@-$(FIND) . -name "*~" -exec rm -f {} \;
 	@echo "done!"
 
 # Pull in dependencies autogenerated by gcc's -MMD switch