X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flinux%2FMakefile;h=8d83aafaf66a389d2a16938ada3fdeef3f39f6fd;hb=87accdf72da5e373876a6661217bbac69ce4d607;hp=033d3bd5a571796bd000739a6aabaea7304b412b;hpb=87b0845f3733166b491ae236feb8bc2eb0fca2ec;p=picodrive.git

diff --git a/platform/linux/Makefile b/platform/linux/Makefile
index 033d3bd..8d83aaf 100644
--- a/platform/linux/Makefile
+++ b/platform/linux/Makefile
@@ -32,13 +32,15 @@ OBJS += platform/gp2x/in_gp2x.o
 endif
 
 # Pico
-OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o \
 	pico/videoport.o pico/draw2.o pico/draw.o pico/z80if.o pico/patch.o \
-	pico/mode4.o pico/sms.o pico/debug.o
+	pico/mode4.o pico/sms.o pico/misc.o pico/eeprom.o pico/debug.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/cue.o pico/cd/gfx_cd.o \
 	pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
+# Pico - 32X
+OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o
 # Pico - Pico
 OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
 # Pico - sound
@@ -55,7 +57,7 @@ OBJS += unzip/unzip.o unzip/unzip_stream.o
 ifeq "$(use_musashi)" "1"
 DEFINES += EMU_M68K
 OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
-OBJS += cpu/musashi/m68kdasm.o
+#OBJS += cpu/musashi/m68kdasm.o
 endif
 ifeq "$(use_fame)" "1"
 DEFINES += EMU_F68K
@@ -69,6 +71,8 @@ else
 DEFINES += _USE_CZ80
 OBJS += cpu/cz80/cz80.o
 endif
+# sh2
+OBJS += cpu/sh2mame/sh2pico.o
 # misc
 ifeq "$(use_fame)" "1"
 ifeq "$(use_musashi)" "1"
@@ -81,7 +85,7 @@ CFLAGS += $(addprefix -D,$(DEFINES))
 vpath %.c = ../..
 
 DIRS = platform platform/gp2x platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \
-	zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
+	pico/32x zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80 cpu/sh2mame
 
 all: mkdirs PicoDrive
 clean: tidy
@@ -90,9 +94,8 @@ tidy:
 	$(RM) $(OBJS)
 	rm -rf $(DIRS)
 	@make -C ../../cpu/mz80/ clean
-	@make -C ../common/helix/ X86=1 clean
 
-PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
+PicoDrive : $(OBJS)
 	@echo ">>>" $@
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
 
@@ -103,7 +106,7 @@ include ../common/revision.mak
 
 pico/carthw/svp/compiler.o : ../../pico/carthw/svp/gen_arm.c
 pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
-pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
+pico/memory.o pico/cd/memory.o : ../../pico/pico_int.h ../../pico/memory.h
 
 ../../cpu/musashi/m68kops.c :
 	@make -C ../../cpu/musashi
@@ -115,9 +118,6 @@ cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
 ../../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 ">>>" $<
 	$(CC) $(CFLAGS) -c $< -o $@