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

diff --git a/linux/Makefile b/linux/Makefile
index 12b8860..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
@@ -51,9 +56,7 @@ 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
@@ -66,9 +69,12 @@ tidy:
 
 PicoDrive : $(OBJS) ../gp2x/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 $@
 	@nasm -f elf $< -o $@
@@ -92,7 +98,7 @@ PicoDrive : $(OBJS) ../gp2x/helix/helix_mp3_x86.a
 	@$(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 $@