X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2FMakefile;h=c2870540c127f090f0cd413f65b5aad11edc0864;hb=8d5cb10d611a93fb21139bab7a11e7ff0d2292e6;hp=c3b04cd95c6dae2b84dad56e5909feec1a414eaa;hpb=5ecedd0cc2257b564dfcf68cb0e9d7d541bfc2b8;p=libpicofe.git

diff --git a/psp/Makefile b/psp/Makefile
index c3b04cd..c287054 100644
--- a/psp/Makefile
+++ b/psp/Makefile
@@ -6,23 +6,25 @@ PSPSDK = $(shell psp-config --pspsdk-path)
 #use_musashi = 1
 #use_mz80 = 1
 amalgamate = 0
+for_15fw = 1
 
 
-CFLAGS += -I../.. -I. -DNO_SYNC -DLPRINTF_STDIO
+CFLAGS += -I../.. -I. -DNO_SYNC
 CFLAGS += -Wall -Winline -G0
-CFLAGS += -DLPRINTF_STDIO
-#CFLAGS += -fprofile-generate
-#CFLAGS += -fprofile-use
+#CFLAGS += -DLPRINTF_STDIO
 #CFLAGS += -pg
 ifeq ($(DEBUG),)
 CFLAGS += -O2 -ftracer -fstrength-reduce -ffast-math
 else
 CFLAGS += -ggdb
 endif
+ifeq "$(for_15fw)" "1"
+CFLAGS += -DFW15
+endif
 
 
-# frontend
-OBJS += main.o emu.o mp3.o menu.o psp.o
+# frontend and stuff
+OBJS += main.o emu.o mp3.o menu.o psp.o asm_utils.o
 
 # common
 OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/readpng.o
@@ -72,7 +74,7 @@ endif
 OBJS += data/bg32.o data/bg40.o
 
 
-LIBS += -lpng -lm -lpspgu -lpsppower -lpspaudio -lpsprtc -lpspaudiocodec
+LIBS += -lpng -lm -lpspgu -lpsppower -lpspaudio -lpsprtc -lpspaudiocodec -lpspkubridge
 #LIBS += -lpspprof
 LDFLAGS += -Wl,-Map=PicoDrive.map
 
@@ -83,6 +85,9 @@ EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = PicoDrive
 PSP_EBOOT_ICON = data/icon.png
 #PSP_EBOOT_PIC1 = .png
+ifneq "$(for_15fw)" "1"
+BUILD_PRX = 1
+endif
 
 CUSTOM_CLEAN = myclean
 
@@ -108,7 +113,11 @@ AS := psp-as
 
 ../../Pico/Memory.o : ../../Pico/Memory.c
 	@echo ">>>" $<
-	$(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS
+	$(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS
+
+../../Pico/cd/Memory.o : ../../Pico/cd/Memory.c
+	@echo ">>>" $<
+	$(CC) $(CFLAGS) -O2 -c $< -o $@
 
 ../../Pico/Draw.o : ../../Pico/Draw.c
 	@echo ">>>" $<
@@ -118,6 +127,10 @@ AS := psp-as
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS
 
+../../Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.c
+	@echo ">>>" $<
+	$(CC) $(CFLAGS) -O2 -c $< -o $@
+
 readme.txt: ../../tools/textfilter ../base_readme.txt
 	../../tools/textfilter ../base_readme.txt $@ PSP
 
@@ -131,13 +144,17 @@ data/bg40.o: data/bg40.bin
 	bin2o -i $< $@ bgdatac40
 
 #
+ifndef UPDIR
+UPDIR = /media/disk/PSP/GAME/PicoDrive/
+endif
 up: EBOOT.PBP
-	@cp -v $^ /media/disk/PSP/GAME/PicoDrive/
+	@cp -v $^ $(UPDIR)
 
 
 # cleanup
 
 myclean:
+	$(RM) PicoDrive.map
 	make -C ../../cpu/musashi clean
 
 
@@ -154,5 +171,16 @@ endif
 
 # ?
 rel: EBOOT.PBP readme.txt
-	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
+	mkdir -p PicoDrive/skin/
+	cp $^ PicoDrive/
+	cp skin/* PicoDrive/skin/
+	zip -9 -r ../../PicoDrive_psp_$(VER).zip PicoDrive
+	rm -rf PicoDrive
+
+rel_kxploit: readme.txt
+	mkdir -p PicoDrive/skin/
+	cp $^ PicoDrive/
+	cp skin/* PicoDrive/skin/
+	zip -9 -r ../../PicoDrive_psp_$(VER)_kxploit.zip PicoDrive
+	zip -9 -r ../../PicoDrive_psp_$(VER)_kxploit.zip PicoDrive%