bugfixes, state load for new mode

[libpicofe.git] / psp / Makefile

diff --git a/psp/Makefile b/psp/Makefile
index c287054..c89f1d6 100644 (file)
--- a/psp/Makefile
+++ b/psp/Makefile
@@ -27,7 +27,7 @@ endif
 OBJS += main.o emu.o mp3.o menu.o psp.o asm_utils.o\r
 \r
 # common\r
-OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/readpng.o\r
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/config.o ../common/readpng.o\r
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
@@ -38,8 +38,11 @@ OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.
                ../../Pico/Patch.o ../../Pico/Draw_amips.o ../../Pico/Memory_amips.o ../../Pico/Misc_amips.o\r
 # Pico - CD\r
 OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \\r
-               ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o \\r
+               ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/cue.o ../../Pico/cd/gfx_cd.o \\r
                ../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o\r
+# Pico - carthw\r
+OBJS += ../../Pico/carthw/carthw.o ../../Pico/carthw/svp/svp.o ../../Pico/carthw/svp/Memory.o \\r
+               ../../Pico/carthw/svp/ssp16.o\r
 endif\r
 \r
 # Pico - sound\r
@@ -170,17 +173,25 @@ endif
 endif\r
 \r
 # ?\r
-rel: EBOOT.PBP readme.txt\r
+rel: EBOOT.PBP readme.txt ../game_def.cfg\r
        mkdir -p PicoDrive/skin/\r
        cp $^ PicoDrive/\r
        cp skin/* PicoDrive/skin/\r
        zip -9 -r ../../PicoDrive_psp_$(VER).zip PicoDrive\r
        rm -rf PicoDrive\r
+       mkdir bin_to_cso_mp3\r
+       cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/\r
+       zip -9 -r ../../PicoDrive_psp_$(VER).zip bin_to_cso_mp3\r
+       rm -rf bin_to_cso_mp3\r
 \r
-rel_kxploit: readme.txt\r
+rel_kxploit: readme.txt ../game_def.cfg\r
        mkdir -p PicoDrive/skin/\r
        cp $^ PicoDrive/\r
        cp skin/* PicoDrive/skin/\r
        zip -9 -r ../../PicoDrive_psp_$(VER)_kxploit.zip PicoDrive\r
        zip -9 -r ../../PicoDrive_psp_$(VER)_kxploit.zip PicoDrive%\r
+       mkdir bin_to_cso_mp3\r
+       cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/\r
+       zip -9 -r ../../PicoDrive_psp_$(VER)_kxploit.zip bin_to_cso_mp3\r
+       rm -rf bin_to_cso_mp3\r
 \r