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

diff --git a/linux/Makefile b/linux/Makefile
index 12cb4a2..e3aac31 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -28,7 +28,7 @@ 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
+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,8 +45,6 @@ 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
 DEFINC += -DEMU_M68K
 OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
@@ -65,9 +63,9 @@ 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 $@
 
@@ -82,8 +80,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 $<
@@ -97,8 +95,3 @@ 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
-#	@echo $<
-#	@$(GCC) $(COPT) $(DEFINC) -D_ASM_DRAW_C -c $< -o $@
-