Added HOSTCC to m68000 Makefile, improvements to M68K disassembler.

[virtualjaguar] / src / m68000 / Makefile

diff --git a/src/m68000/Makefile b/src/m68000/Makefile
index 430943b951222ff9a3e6f212449ed269ca46bea7..f8e43f6b7a3514add036fe68d9777577576481c2 100644 (file)
--- a/src/m68000/Makefile
+++ b/src/m68000/Makefile
@@ -13,14 +13,11 @@
 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 \
@@ -48,12 +45,10 @@ 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 $@
 
 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 $@
 
 # Generated code
@@ -65,8 +60,7 @@ 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
+       @$(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"
@@ -74,13 +68,11 @@ obj/cpudefs.c: obj/build68k
 
 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
+       @$(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