minor adjustments

[libpicofe.git] / psp / Makefile

diff --git a/psp/Makefile b/psp/Makefile
index d990ba6..c287054 100644 (file)
--- a/psp/Makefile
+++ b/psp/Makefile
@@ -6,23 +6,25 @@ PSPSDK = $(shell psp-config --pspsdk-path)
 #use_musashi = 1\r
 #use_mz80 = 1\r
 amalgamate = 0\r
+for_15fw = 1\r
 \r
 \r
 CFLAGS += -I../.. -I. -DNO_SYNC\r
 CFLAGS += -Wall -Winline -G0\r
 #CFLAGS += -DLPRINTF_STDIO\r
-#CFLAGS += -fprofile-generate\r
-#CFLAGS += -fprofile-use\r
 #CFLAGS += -pg\r
 ifeq ($(DEBUG),)\r
 CFLAGS += -O2 -ftracer -fstrength-reduce -ffast-math\r
 else\r
 CFLAGS += -ggdb\r
 endif\r
+ifeq "$(for_15fw)" "1"\r
+CFLAGS += -DFW15\r
+endif\r
 \r
 \r
-# frontend\r
-OBJS += main.o emu.o mp3.o menu.o psp.o\r
+# frontend and stuff\r
+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
@@ -72,7 +74,7 @@ endif
 OBJS += data/bg32.o data/bg40.o\r
 \r
 \r
-LIBS += -lpng -lm -lpspgu -lpsppower -lpspaudio -lpsprtc -lpspaudiocodec\r
+LIBS += -lpng -lm -lpspgu -lpsppower -lpspaudio -lpsprtc -lpspaudiocodec -lpspkubridge\r
 #LIBS += -lpspprof\r
 LDFLAGS += -Wl,-Map=PicoDrive.map\r
 \r
@@ -83,7 +85,9 @@ EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = PicoDrive\r
 PSP_EBOOT_ICON = data/icon.png\r
 #PSP_EBOOT_PIC1 = .png\r
+ifneq "$(for_15fw)" "1"\r
 BUILD_PRX = 1\r
+endif\r
 \r
 CUSTOM_CLEAN = myclean\r
 \r
@@ -109,7 +113,11 @@ AS := psp-as
 \r
 ../../Pico/Memory.o : ../../Pico/Memory.c\r
        @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS\r
+\r
+../../Pico/cd/Memory.o : ../../Pico/cd/Memory.c\r
+       @echo ">>>" $<\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@\r
 \r
 ../../Pico/Draw.o : ../../Pico/Draw.c\r
        @echo ">>>" $<\r
@@ -119,6 +127,10 @@ AS := psp-as
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS\r
 \r
+../../Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.c\r
+       @echo ">>>" $<\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@\r
+\r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
        ../../tools/textfilter ../base_readme.txt $@ PSP\r
 \r
@@ -142,6 +154,7 @@ up: EBOOT.PBP
 # cleanup\r
 \r
 myclean:\r
+       $(RM) PicoDrive.map\r
        make -C ../../cpu/musashi clean\r
 \r
 \r
@@ -158,5 +171,16 @@ endif
 \r
 # ?\r
 rel: EBOOT.PBP readme.txt\r
-       zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\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
+\r
+rel_kxploit: readme.txt\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
 \r