X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2FMakefile;h=12cb4a29ad40372f52646bafc7105c0e2fb6d140;hb=bd1806ca3217f25ce1c0cf6c24894a3066c7e3f8;hp=88d873547c32a2a318ed7b0c318fc60d4381c79c;hpb=5f9922e6c2c69cb940e70f1d108aac2c3d0b01d7;p=libpicofe.git

diff --git a/linux/Makefile b/linux/Makefile
index 88d8735..12cb4a2 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,9 +24,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/menu.o ../common/fonts.o ../common/readpng.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
@@ -44,17 +49,14 @@ OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
 OBJS += ../gp2x/mp3.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
@@ -63,11 +65,15 @@ clean: tidy
 tidy:
 	@$(RM) $(OBJS)
 	@make -C ../../cpu/mz80/ clean
+	@make -C ../gp2x/helix/ X86=1 clean
 
-PicoDrive : $(OBJS)
+PicoDrive : $(OBJS) ../gp2x/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 $@
@@ -76,6 +82,9 @@ PicoDrive : $(OBJS)
 ../../cpu/mz80/mz80.asm :
 	@make -C ../../cpu/mz80/
 
+../gp2x/helix/helix_mp3_x86.a:
+	@make -C ../gp2x/helix/ X86=1 clean all
+
 .c.o:
 	@echo $<
 	@$(GCC) $(COPT) $(DEFINC) -c $< -o $@
@@ -86,10 +95,10 @@ PicoDrive : $(OBJS)
 
 ../../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
-	@echo $<
-	@$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@
+#../../Pico/Draw.o : ../../Pico/Draw.c
+#	@echo $<
+#	@$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@