X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2FMakefile;h=6aed56e105abd03a15c78a20167f20c1ecdf520d;hb=6f748c477fca1c4962358f163fa19e3b5710bc33;hp=9a8f3df81d7b227dd9145b3c77ebda50c667989d;hpb=d9a189437aa503963b96fe382883723d40eebef6;p=libpicofe.git

diff --git a/linux/Makefile b/linux/Makefile
index 9a8f3df..6aed56e 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,10 +1,11 @@
 
 # settings
-dprint = 1
+use_fame = 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,9 +25,14 @@ COPT    += `pkg-config --cflags gthread-2.0`
 LDFLAGS += `pkg-config --libs gthread-2.0`
 
 # frontend
-OBJS += ../gp2x/main.o ../gp2x/menu.o ../gp2x/fonts.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 \
+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
@@ -40,21 +46,21 @@ 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_fame)" "1"
+DEFINC += -DEMU_F68K
+OBJS += ../../cpu/fame/famec.o
+else
 DEFINC += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kcpu.o  ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o \
-	../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o
+OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+endif
 # mz80
 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
+#OBJS += fakedasm.o
 
 
 all: PicoDrive
@@ -63,12 +69,15 @@ 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 -Wl,-Map=PicoDrive.map -o $@
+	@$(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 $@
@@ -77,8 +86,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 $<
@@ -90,10 +99,9 @@ PicoDrive : $(OBJS) ../gp2x/helix/helix_mp3_x86.a
 
 ../../Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c
 	@echo $@
-	@$(GCC) $(COPT_COMMON) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@ # -mtune=arm940t
+	@$(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 $@