Added HOSTCC to m68000 Makefile, improvements to M68K disassembler.

[virtualjaguar] / src / m68000 / Makefile

diff --git a/src/m68000/Makefile b/src/m68000/Makefile
index 8e4577236091e70d8006f185931c3695fb0742bf..f8e43f6b7a3514add036fe68d9777577576481c2 100644 (file)
--- a/src/m68000/Makefile
+++ b/src/m68000/Makefile
@@ -7,15 +7,17 @@
 # This makefile is released under the GPLv3 or later
 #
 
-CC      := gcc
-LD      := gcc
-AR      := ar
-ARFLAGS := -rs
+# Cross compilation using MXE
+#CROSS = i686-pc-mingw32-
 
-# 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
+CC      := $(CROSS)gcc
+LD      := $(CROSS)gcc
+AR      := $(CROSS)ar
+HOSTCC  := gcc
 
-INCS    := -I./ -I./obj `sdl-config --cflags`
+ARFLAGS := -rs
+GCC_DEPS = -MMD
+INCS    := -I. -I./obj `$(CROSS)sdl-config --cflags`
 
 OBJS = \
        obj/cpustbl.o \
@@ -26,8 +28,6 @@ OBJS = \
        obj/m68kinterface.o \
        obj/m68kdasm.o
 
-#      obj/newcpu.o \
-
 # Targets for convenience sake, not "real" targets
 .PHONY: clean
 
@@ -35,7 +35,7 @@ all: obj obj/libm68k.a
        @echo "Done!"
 
 # Library rules (might not be cross-platform compatible)
-obj/libm68k.a: $(OBJS) 
+obj/libm68k.a: $(OBJS)
        @$(AR) $(ARFLAGS) obj/libm68k.a $(OBJS)
 
 obj:
@@ -45,11 +45,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 $@
 
 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
 
@@ -60,7 +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) $(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"
@@ -68,12 +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) $(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