X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2FMakefile;h=90a149c67beb0b37616e6bd7af38d946b608dcc8;hb=a52e1f622222d0d70cda3ee9fddd87bcd32f1629;hp=3380ae9ab1f1b2be77c3686e76003694770b2a28;hpb=c7a4ff64287b12487c7e9cc13ce3b7d2aa6e1f06;p=libpicofe.git

diff --git a/linux/Makefile b/linux/Makefile
index 3380ae9..90a149c 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,10 +1,12 @@
 
 # settings
-dprint = 1
+#use_musashi = 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
@@ -25,10 +27,10 @@ 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
+		gp2x.o 940ctl_ym2612.o log_io.o
 
 # common
-OBJS += ../common/menu.o ../common/fonts.o ../common/readpng.o
+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/Memory.o ../../Pico/Misc.o \
@@ -45,20 +47,26 @@ OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i
 	../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o
 # unzip
 OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
-# mp3
-OBJS += ../gp2x/mp3.o
 # CPU cores
+ifeq "$(use_musashi)" "1"
 DEFINC += -DEMU_M68K
 OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
-# mz80
-DEFINC += -D_USE_MZ80
+else
+DEFINC += -DEMU_F68K
+OBJS += ../../cpu/fame/famec.o
+endif
+# z80
+ifeq "$(use_mz80)" "1"
+CFLAGS += -D_USE_MZ80
 OBJS += ../../cpu/mz80/mz80.o
+else
+CFLAGS += -D_USE_CZ80
+OBJS += ../../cpu/cz80/cz80.o
+endif
 
 # faked asm
 #DEFINC += -D_ASM_DRAW_C
-#DEFINC += -D_ASM_MEMORY_C
-#DEFINC += -D_ASM_YM2612_C
-OBJS += fakedasm.o
+#OBJS += fakedasm.o
 
 
 all: PicoDrive
@@ -67,13 +75,16 @@ clean: tidy
 tidy:
 	@$(RM) $(OBJS)
 	@make -C ../../cpu/mz80/ clean
-	@make -C ../gp2x/helix/ X86=1 clean
+	@make -C ../common/helix/ X86=1 clean
 
-PicoDrive : $(OBJS) ../gp2x/helix/helix_mp3_x86.a
+PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
 	@echo $@
 	@$(GCC) $(COPT) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
 
 
+../../cpu/musashi/m68kops.c :
+	@make -C ../../cpu/musashi
+
 ../../cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
 	@echo $@
 	@nasm -f elf $< -o $@
@@ -81,8 +92,8 @@ PicoDrive : $(OBJS) ../gp2x/helix/helix_mp3_x86.a
 ../../cpu/mz80/mz80.asm :
 	@make -C ../../cpu/mz80/
 
-../gp2x/helix/helix_mp3_x86.a:
-	@make -C ../gp2x/helix/ X86=1 clean all
+../common/helix/helix_mp3_x86.a:
+	@make -C ../common/helix/ X86=1 clean all
 
 .c.o:
 	@echo $<
@@ -96,8 +107,7 @@ PicoDrive : $(OBJS) ../gp2x/helix/helix_mp3_x86.a
 	@echo $@
 	@$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@ # -mtune=arm940t -DEXTERNAL_YM2612
 
-# faked asm
-../../Pico/Draw.o : ../../Pico/Draw.c
+../../cpu/fame/famec.o : ../../cpu/fame/famec.c
 	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@
+	@$(GCC) $(COPT) $(DEFINC) -Wno-unused -c $< -o $@