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

diff --git a/psp/Makefile b/psp/Makefile
index c3b04cd..075130e 100644
--- a/psp/Makefile
+++ b/psp/Makefile
@@ -6,89 +6,107 @@ 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
+OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o platform/common/readpng.o
 
 # Pico
 ifeq "$(amalgamate)" "1"
 OBJS += ../../PicoAll.o
 else
-OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \
-		../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \
-		../../Pico/Patch.o ../../Pico/Draw_amips.o ../../Pico/Memory_amips.o ../../Pico/Misc_amips.o
+OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o \
+		Pico/Pico.o Pico/Sek.o Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o \
+		Pico/Patch.o Pico/Draw_amips.o Pico/Memory_amips.o Pico/Misc_amips.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/gfx_cd.o \
-		../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o
+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 - carthw
+OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \
+		Pico/carthw/svp/ssp16.o
+# Pico - Pico
+OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o
 endif
 
 # Pico - sound
 ifneq "$(amalgamate)" "1"
-OBJS += ../../Pico/sound/sound.o
+OBJS += Pico/sound/sound.o
 endif
-OBJS += ../../Pico/sound/mix.o
-OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
+OBJS += Pico/sound/mix.o
+OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o
 # zlib (hacked)
-OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \
-	../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o \
-	../../zlib/uncompr.o
+OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
+	zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o \
+	zlib/uncompr.o
 # unzip
-OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
+OBJS += unzip/unzip.o unzip/unzip_stream.o
 # CPU cores
 ifeq "$(use_musashi)" "1"
 CFLAGS += -DEMU_M68K
-OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
 else
 CFLAGS += -DEMU_F68K
-OBJS += ../../cpu/fame/famec.o
+OBJS += cpu/fame/famec.o
 endif
 # z80
 ifeq "$(use_mz80)" "1"
 CFLAGS += -D_USE_MZ80
-OBJS += ../../cpu/mz80/mz80.o
+OBJS += cpu/mz80/mz80.o
 else
 CFLAGS += -D_USE_CZ80
-OBJS += ../../cpu/cz80/cz80.o
+OBJS += cpu/cz80/cz80.o
 endif
 # bg images
 OBJS += data/bg32.o data/bg40.o
 
+vpath %.c = ../..
+vpath %.s = ../..
+DIRS = platform platform/psp platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \
+	zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80
+
 
-LIBS += -lpng -lm -lpspgu -lpsppower -lpspaudio -lpsprtc -lpspaudiocodec
+LIBS += -lpng -lm -lpspgu -lpsppower -lpspaudio -lpsprtc -lpspaudiocodec -lpspkubridge
 #LIBS += -lpspprof
 LDFLAGS += -Wl,-Map=PicoDrive.map
 
 
 # target
 TARGET = PicoDrive
-EXTRA_TARGETS = EBOOT.PBP
+EXTRA_TARGETS = mkdirs 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
 
 include $(PSPSDK)/lib/build.mak
 
 # some additional rules
+mkdirs:
+	mkdir -p $(DIRS)
+
 .c.o:
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -102,22 +120,30 @@ AS := psp-as
 ../../cpu/musashi/m68kops.c :
 	make -C ../../cpu/musashi
 
-../../cpu/fame/famec.o : ../../cpu/fame/famec.c
+cpu/fame/famec.o : ../../cpu/fame/famec.c
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -Wno-unused -c $< -o $@
 
-../../Pico/Memory.o : ../../Pico/Memory.c
+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/Draw.o : ../../Pico/Draw.c
+Pico/cd/Memory.o : ../../Pico/cd/Memory.c
+	@echo ">>>" $<
+	$(CC) $(CFLAGS) -O2 -c $< -o $@
+
+Pico/Draw.o : ../../Pico/Draw.c
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -c $< -o $@ -D_ASM_DRAW_C_AMIPS
 
-../../Pico/Misc.o : ../../Pico/Misc.c
+Pico/Misc.o : ../../Pico/Misc.c
 	@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 +157,18 @@ 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 -rf $(DIRS)
+	$(RM) PicoDrive.map
 	make -C ../../cpu/musashi clean
 
 
@@ -153,6 +184,25 @@ endif
 endif
 
 # ?
-rel: EBOOT.PBP readme.txt
-	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
+rel: EBOOT.PBP readme.txt ../game_def.cfg
+	mkdir -p PicoDrive/skin/
+	cp $^ PicoDrive/
+	cp skin/* PicoDrive/skin/
+	zip -9 -r ../../PicoDrive_psp_$(VER).zip PicoDrive
+	rm -rf PicoDrive
+	mkdir bin_to_cso_mp3
+	cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/
+	zip -9 -r ../../PicoDrive_psp_$(VER).zip bin_to_cso_mp3
+	rm -rf bin_to_cso_mp3
+
+rel_kxploit: readme.txt ../game_def.cfg
+	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%
+	mkdir bin_to_cso_mp3
+	cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/
+	zip -9 -r ../../PicoDrive_psp_$(VER)_kxploit.zip bin_to_cso_mp3
+	rm -rf bin_to_cso_mp3