X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2FMakefile;h=49f9f7b998b801e5dea944317cc46d1e3fee70d1;hb=4b8f4f3c0d614637f1ec6df36330b1ad7a32b498;hp=769f3edb4091178c7d23a6587be45915eb494b72;hpb=2951214ea65ce2e2ac40671511b8d5a9ea2d2842;p=libpicofe.git

diff --git a/psp/Makefile b/psp/Makefile
index 769f3ed..49f9f7b 100644
--- a/psp/Makefile
+++ b/psp/Makefile
@@ -3,17 +3,17 @@
 PSPSDK = $(shell psp-config --pspsdk-path)
 
 # settings
-use_musashi = 1
-use_mz80 = 1
+#use_musashi = 1
+#use_mz80 = 1
 amalgamate = 0
 #profile = 1
 #up = 1
 
 
-CFLAGS += -I../.. -I. -D_UNZIP_SUPPORT -DNO_SYNC # -DBENCHMARK
-CFLAGS += -Wall -Winline
+CFLAGS += -I../.. -I. -DNO_SYNC
+CFLAGS += -Wall -Winline -G0
 ifeq ($(DEBUG),)
-CFLAGS += -O2 -G0 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+CFLAGS += -O2 -ftracer -fstrength-reduce -ffast-math
 else
 CFLAGS += -ggdb
 endif
@@ -37,7 +37,7 @@ 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/Patch.o ../../Pico/Draw_amips.o ../../Pico/Memory_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 \
@@ -52,53 +52,82 @@ 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/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
 # CPU cores
 ifeq "$(use_musashi)" "1"
 CFLAGS += -DEMU_M68K
 OBJS += ../../cpu/musashi/m68kops.o ../../cpu/musashi/m68kcpu.o
+else
+CFLAGS += -DEMU_F68K
+OBJS += ../../cpu/fame/famec.o
 endif
 # z80
 ifeq "$(use_mz80)" "1"
 CFLAGS += -D_USE_MZ80
 OBJS += ../../cpu/mz80/mz80.o
 else
-$(error nothing here!)
+CFLAGS += -D_USE_CZ80
+OBJS += ../../cpu/cz80/cz80.o
 endif
+# bg images
+OBJS += data/bg32.o data/bg40.o
 
 
-LIBS += -lpng -lm -lpspgu # -lpspaudio -lpspgu -lpsppower -lpsphprm -lz -lm -lstdc++
+LIBS += -lpng -lm -lpspgu -lpsppower -Wl,-Map=PicoDrive.map -lpspaudio
 
 # target
 TARGET = PicoDrive
 EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = PICODRIVE
-#PSP_EBOOT_ICON = .png
+PSP_EBOOT_ICON = data/icon.png
 #PSP_EBOOT_PIC1 = .png
 
 CUSTOM_CLEAN = myclean
 
 include $(PSPSDK)/lib/build.mak
 
-
 # some additional rules
 .c.o:
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -c $< -o $@
 
+AS := psp-as
+
+.s.o:
+	@echo ">>>" $<
+	$(AS) -march=allegrex -mtune=allegrex $< -o $@
+
 ../../cpu/musashi/m68kops.c :
 	make -C ../../cpu/musashi
 
+../../cpu/fame/famec.o : ../../cpu/fame/famec.c
+	@echo ">>>" $<
+	$(CC) $(CFLAGS) -Wno-unused -c $< -o $@
+
+../../Pico/Memory.o : ../../Pico/Memory.c
+	@echo ">>>" $<
+	$(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS
+
+../../Pico/Draw.o : ../../Pico/Draw.c
+	@echo ">>>" $<
+	$(CC) $(CFLAGS) -c $< -o $@ -D_ASM_DRAW_C_MIPS
+
 readme.txt: ../../tools/textfilter ../base_readme.txt
 	../../tools/textfilter ../base_readme.txt $@ PSP
 
 ../../tools/textfilter: ../../tools/textfilter.c
 	make -C ../../tools/ textfilter
 
+data/bg32.o: data/bg32.bin
+	bin2o -i $< $@ bgdatac32
 
-# ?
+data/bg40.o: data/bg40.bin
+	bin2o -i $< $@ bgdatac40
+
+#
 up: EBOOT.PBP
 	@cp -v $^ /media/disk/PSP/GAME/PicoDrive/