build improvements for gph/psp devices

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index ced50a4..083ce14 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -8,6 +8,8 @@ ifneq "$(BUILD)" ""
 VER := $(VER)_$(BUILD)\r
 endif\r
 \r
+include ../../config.mak\r
+\r
 all: rel\r
 \r
 ../../tools/textfilter: ../../tools/textfilter.c\r
@@ -18,7 +20,10 @@ readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog
 \r
 CODE940 = code940/pico940_v3.bin\r
 \r
-rel: ../../PicoDrive PicoDrive.gpe $(CODE940) readme.txt ../game_def.cfg \\r
+PicoDrive: ../../PicoDrive\r
+       $(STRIP) $^ -o $@\r
+\r
+rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt ../game_def.cfg \\r
                PicoDrive.png PicoDrive_s.png PicoDrive_t.png \\r
                warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko \\r
                ../../pico/carthw.cfg\r

diff --git a/platform/psp/Makefile b/platform/psp/Makefile
index 1e45153..ee6ed25 100644 (file)
--- a/platform/psp/Makefile
+++ b/platform/psp/Makefile
@@ -1,179 +1,4 @@
 \r
-# pspdev is expected to be in path\r
-PSPSDK = $(shell psp-config --pspsdk-path)\r
-\r
-# settings\r
-#use_musashi = 1\r
-#use_mz80 = 1\r
-amalgamate = 0\r
-for_15fw = 1\r
-# :!touch platform/psp/psp.c\r
-\r
-\r
-CFLAGS += -I../.. -I. -DNO_SYNC -D_ASM_DRAW_C_AMIPS\r
-CFLAGS += -Wall -Winline -G0\r
-#CFLAGS += -DLPRINTF_STDIO\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
-ifneq "$(BUILD)" ""\r
-# frontend and stuff\r
-OBJS += main.o emu.o mp3.o menu.o psp.o asm_utils.o\r
-\r
-# common\r
-OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o platform/common/readpng.o\r
-\r
-# Pico\r
-ifeq "$(amalgamate)" "1"\r
-OBJS += ../../picoAll.o\r
-else\r
-OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o pico/videoport.o \\r
-       pico/draw2.o pico/draw.o pico/z80if.o pico/patch.o pico/draw_amips.o pico/memory_amips.o \\r
-       pico/misc_amips.o pico/debug.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/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
-# Pico - Pico\r
-OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
-endif\r
-\r
-# Pico - sound\r
-ifneq "$(amalgamate)" "1"\r
-OBJS += pico/sound/sound.o\r
-endif\r
-OBJS += pico/sound/mix.o\r
-OBJS += pico/sound/sn76496.o pico/sound/ym2612.o\r
-# zlib (hacked)\r
-OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
-       zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o \\r
-       zlib/uncompr.o\r
-# unzip\r
-OBJS += unzip/unzip.o unzip/unzip_stream.o\r
-# CPU cores\r
-ifeq "$(use_musashi)" "1"\r
-CFLAGS += -DEMU_M68K\r
-OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
-else\r
-CFLAGS += -DEMU_F68K\r
-OBJS += cpu/fame/famec.o\r
-endif\r
-# z80\r
-ifeq "$(use_mz80)" "1"\r
-CFLAGS += -D_USE_MZ80\r
-OBJS += cpu/mz80/mz80.o\r
-else\r
-CFLAGS += -D_USE_CZ80\r
-OBJS += cpu/cz80/cz80.o\r
-endif\r
-# bg images\r
-OBJS += data/bg32.o data/bg40.o\r
-\r
-vpath %.c = ../..\r
-vpath %.s = ../..\r
-DIRS = platform platform/psp platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \\r
-       zlib unzip cpu cpu/musashi cpu/fame cpu/mz80 cpu/cz80\r
-\r
-\r
-LIBS += -lpng -lm -lpspgu -lpsppower -lpspaudio -lpsprtc -lpspaudiocodec -lpspkubridge\r
-#LIBS += -lpspprof\r
-LDFLAGS += -Wl,-Map=PicoDrive.map\r
-\r
-\r
-# target\r
-TARGET = PicoDrive\r
-EXTRA_TARGETS = mkdirs EBOOT.PBP\r
-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
-include $(PSPSDK)/lib/build.mak\r
-\r
-# some additional rules\r
-mkdirs:\r
-       mkdir -p $(DIRS)\r
-\r
-.c.o:\r
-       @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -c $< -o $@\r
-\r
-AS := psp-as\r
-\r
-.s.o:\r
-       @echo ">>>" $<\r
-       $(AS) -march=allegrex -mtune=allegrex $< -o $@\r
-\r
-../../cpu/musashi/m68kops.c :\r
-       make -C ../../cpu/musashi\r
-\r
-cpu/fame/famec.o : ../../cpu/fame/famec.c\r
-       @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -Wno-unused -c $< -o $@\r
-\r
-pico/misc.o : ../../pico/misc.c\r
-       @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS\r
-\r
-pico/memory.o : ../../pico/memory.c\r
-       @echo ">>>" $<\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/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
-../../tools/textfilter: ../../tools/textfilter.c\r
-       make -C ../../tools/ textfilter\r
-\r
-data/bg32.o: data/bg32.bin\r
-       bin2o -i $< $@ bgdatac32\r
-\r
-data/bg40.o: data/bg40.bin\r
-       bin2o -i $< $@ bgdatac40\r
-\r
-#\r
-ifndef UPDIR\r
-UPDIR = /media/disk/PSP/GAME/PicoDrive/\r
-endif\r
-up: EBOOT.PBP\r
-       @cp -v $^ $(UPDIR)\r
-\r
-\r
-# cleanup\r
-\r
-myclean:\r
-       #rm -rf $(DIRS)\r
-       $(RM) PicoDrive.map\r
-       make -C ../../cpu/musashi clean\r
-\r
-\r
-clean_prof:\r
-       find ../.. -name '*.gcno' -delete\r
-       find ../.. -name '*.gcda' -delete\r
-endif\r
-\r
 # ----------- release -----------\r
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
 ifeq ($(VER),)\r
@@ -182,7 +7,7 @@ endif
 endif\r
 \r
 # ?\r
-rel: EBOOT.PBP readme.txt ../game_def.cfg\r
+rel: ../../EBOOT.PBP readme.txt ../game_def.cfg\r
        mkdir -p PicoDrive/skin/\r
        cp $^ PicoDrive/\r
        cp skin/* PicoDrive/skin/\r