X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2FMakefile;h=e3aac31f9741bdba56427dc93d9f778f70c16780;hb=703e4c7bbb2cfd549797e2092e4d863547b3e87c;hp=732a830d7e8bc1fd245254ed0dbb4506a1f404b9;hpb=0805b5b4783b6b711da83c4704c01c5b615adcca;p=libpicofe.git

diff --git a/linux/Makefile b/linux/Makefile
index 732a830..e3aac31 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -4,7 +4,7 @@ dprint = 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,36 +24,37 @@ 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 \
-		../../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/gfx_cd.o \
-		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.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 ../../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
-# mp3
-OBJS += ../gp2x/mp3.o
+OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
 # CPU cores
 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
 # 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
@@ -62,12 +63,16 @@ clean: tidy
 tidy:
 	@$(RM) $(OBJS)
 	@make -C ../../cpu/mz80/ clean
+	@make -C ../common/helix/ X86=1 clean
 
-PicoDrive : $(OBJS)
+PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
 	@echo $@
-	@$(GCC) $(COPT) $(OBJS) ../gp2x/helix/helix_mp3_x86.a $(LDFLAGS) -lm -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 $@
 	@nasm -f elf $< -o $@
@@ -75,6 +80,9 @@ 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 $@
@@ -85,10 +93,5 @@ PicoDrive : $(OBJS)
 
 ../../Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c
 	@echo $@
-	@$(GCC) $(COPT_COMMON) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@ # -mtune=arm940t
-
-# faked asm
-../../Pico/Draw.o : ../../Pico/Draw.c
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@
+	@$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@ # -mtune=arm940t -DEXTERNAL_YM2612