bugfixes, adjusted famec timing

[picodrive.git] / platform / linux / Makefile

diff --git a/platform/linux/Makefile b/platform/linux/Makefile
index e4d5480..9dd365f 100644 (file)
--- a/platform/linux/Makefile
+++ b/platform/linux/Makefile
@@ -1,10 +1,13 @@
 
 # settings
-dprint = 1
+#use_musashi = 1
+use_fame = 1
+#use_mz80 = 1
+
 # profile = 1
 
 
-DEFINC = -I../.. -I. -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK
+DEFINC = -I../.. -I. -D__GP2X__ -D_UNZIP_SUPPORT -DIO_STATS # -DBENCHMARK
 GCC = gcc
 STRIP = strip
 AS = gcc
@@ -24,33 +27,51 @@ COPT    += `pkg-config --cflags gthread-2.0`
 LDFLAGS += `pkg-config --libs gthread-2.0`
 
 # frontend
-OBJS += ../gp2x/main.o ../gp2x/menu.o ../gp2x/emu.o ../gp2x/usbjoy.o blit.o gp2x.o 940ctl_ym2612.o
+OBJS += ../gp2x/main.o ../gp2x/menu.o ../gp2x/emu.o ../gp2x/usbjoy.o blit.o \
+               gp2x.o 940ctl_ym2612.o log_io.o
+
+# common
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/readpng.o ../common/mp3_helix.o
+
 # Pico
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Utils.o ../../Pico/Memory.o ../../Pico/Misc.o \
-               ../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o
+OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \
+               ../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \
+               ../../Pico/Patch.o
 # Pico - CD
 OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \
-               ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o
+               ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o \
+               ../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
 # Pico - sound
-OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
+OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o ../../Pico/sound/mix.o
 # zlib
 OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \
        ../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o
 # unzip
-OBJS += ../../unzip/unzip.o
+OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
 # CPU cores
+ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kcpu.o  ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o \
-       ../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o
-# mz80
+OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+endif
+ifeq "$(use_fame)" "1"
+DEFINC += -DEMU_F68K
+OBJS += ../../cpu/fame/famec.o
+endif
+# z80
+ifeq "$(use_mz80)" "1"
 DEFINC += -D_USE_MZ80
 OBJS += ../../cpu/mz80/mz80.o
-
-# faked asm
-#DEFINC += -D_ASM_DRAW_C
-#DEFINC += -D_ASM_MEMORY_C
-#DEFINC += -D_ASM_YM2612_C
-OBJS += fakedasm.o
+else
+DEFINC += -D_USE_CZ80
+OBJS += ../../cpu/cz80/cz80.o
+endif
+# misc
+ifeq "$(use_fame)" "1"
+ifeq "$(use_musashi)" "1"
+OBJS += ../../Pico/Debug.o
+OBJS += ../../cpu/musashi/m68kdasm.o
+endif
+endif
 
 
 all: PicoDrive
@@ -59,11 +80,15 @@ clean: tidy
 tidy:
        @$(RM) $(OBJS)
        @make -C ../../cpu/mz80/ clean
+       @make -C ../common/helix/ X86=1 clean
+
+PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
+       @echo ">>>" $@
+       $(GCC) $(COPT) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
 
-PicoDrive : $(OBJS)
-       @echo $@
-       @$(GCC) $(COPT) $(OBJS) $(LDFLAGS) -lm -o $@
 
+../../cpu/musashi/m68kops.c :
+       @make -C ../../cpu/musashi
 
 ../../cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
        @echo $@
@@ -72,20 +97,23 @@ PicoDrive : $(OBJS)
 ../../cpu/mz80/mz80.asm :
        @make -C ../../cpu/mz80/
 
+../common/helix/helix_mp3_x86.a:
+       @make -C ../common/helix/ X86=1 clean all
+
 .c.o:
-       @echo $<
-       @$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+       @echo ">>>" $<
+       $(GCC) $(COPT) $(DEFINC) -c $< -o $@
 .s.o:
-       @echo $<
-       @$(GCC) $(COPT) $(DEFINC) -c $< -o $@
+       @echo ">>>" $<
+       $(GCC) $(COPT) $(DEFINC) -c $< -o $@
 
 
 ../../Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c
-       @echo $@
-       @$(GCC) $(COPT_COMMON) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@ # -mtune=arm940t
+       @echo ">>>" $@
+       $(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@
+
+../../cpu/fame/famec.o : ../../cpu/fame/famec.c ../../cpu/fame/famec_opcodes.h
+       @echo ">>>" $<
+       $(GCC) $(COPT) $(DEFINC) -Wno-unused -c $< -o $@
 
-# faked asm
-../../Pico/Draw.o : ../../Pico/Draw.c
-       @echo $<
-       @$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@