From a1e80026c0062cdc7b265fd1bafbcba97f6f4d23 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 31 Aug 2015 21:04:00 +0200 Subject: [PATCH] Start creating global 'pkg' dir and create vita-cores.sh --- Makefile.wii.salamander | 2 +- dist-scripts/ngc-cores.sh | 16 +++++++++------- dist-scripts/psp1-cores.sh | 32 +++++++++++++++++--------------- dist-scripts/vita-cores.sh | 27 +++++++++++++++++++++++++++ {ngc/pkg => pkg/psp1}/.empty | 0 pkg/vita/.empty | 0 pkg/wii/.empty | 0 {wii/pkg => pkg/wii}/icon.png | Bin {wii/pkg => pkg/wii}/meta.xml | 0 9 files changed, 54 insertions(+), 23 deletions(-) create mode 100755 dist-scripts/vita-cores.sh rename {ngc/pkg => pkg/psp1}/.empty (100%) create mode 100644 pkg/vita/.empty create mode 100644 pkg/wii/.empty rename {wii/pkg => pkg/wii}/icon.png (100%) rename {wii/pkg => pkg/wii}/meta.xml (100%) diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander index 02eb182b56..c5cf4c4ee6 100644 --- a/Makefile.wii.salamander +++ b/Makefile.wii.salamander @@ -79,7 +79,7 @@ $(APP_BOOTER_DIR)/app_booter.bin: $(MAKE) -C $(APP_BOOTER_DIR) pkg: all - cp -r $(DOL_TARGET) wii/pkg/boot.dol + cp -r $(DOL_TARGET) pkg/wii/boot.dol clean: rm -f $(DOL_TARGET) diff --git a/dist-scripts/ngc-cores.sh b/dist-scripts/ngc-cores.sh index c9dc2d7686..966a0f36b9 100755 --- a/dist-scripts/ngc-cores.sh +++ b/dist-scripts/ngc-cores.sh @@ -1,9 +1,11 @@ #!/bin/sh -make -C ../ -f Makefile.griffin platform=ngc clean || exit 1 +PLATFORM=ngc -for f in *_ngc.a ; do - name=`echo "$f" | sed 's/\(_libretro_ngc\|\).a$//'` +make -C ../ -f Makefile.griffin platform=${PLATFORM} clean || exit 1 + +for f in *_${PLATFORM}.a ; do + name=`echo "$f" | sed "s/\(_libretro_${PLATFORM}\|\).a$//"` whole_archive= big_stack= if [ $name = "nxengine" ] ; then @@ -14,8 +16,8 @@ for f in *_ngc.a ; do echo "Tyrquake found, applying big stack..." big_stack="BIG_STACK=1" fi - cp -f "$f" ../libretro_ngc.a - make -C ../ -f Makefile.griffin platform=ngc $whole_archive $big_stack -j3 || exit 1 - mv -f ../retroarch_ngc.dol ../ngc/pkg/${name}_libretro_ngc.dol - rm -f ../retroarch_ngc.dol ../retroarch_ngc.elf ../retroarch_ngc.elf.map + cp -f "$f" ../libretro_${PLATFORM}.a + make -C ../ -f Makefile.griffin platform=${PLATFORM} $whole_archive $big_stack -j3 || exit 1 + mv -f ../retroarch_${PLATFORM}.dol ../pkg/${PLATFORM}/${name}_libretro_${PLATFORM}.dol + rm -f ../retroarch_${PLATFORM}.dol ../retroarch_${PLATFORM}.elf ../retroarch_${PLATFORM}.elf.map done diff --git a/dist-scripts/psp1-cores.sh b/dist-scripts/psp1-cores.sh index 5d31400b2a..da2da95ad7 100755 --- a/dist-scripts/psp1-cores.sh +++ b/dist-scripts/psp1-cores.sh @@ -1,19 +1,21 @@ #!/bin/sh -mkdir -p ../psp1/pkg/cores/ +PLATFORM=psp1 -make -C ../psp1/kernelFunctionsPrx/ clean || exit 1 -make -C ../psp1/kernelFunctionsPrx/ || exit 1 -cp -f ../kernel_functions.prx ../psp1/pkg/kernel_functions.prx +mkdir -p ../${PLATFORM}/pkg/cores/ -make -C ../ -f Makefile.psp1.salamander clean || exit 1 -make -C ../ -f Makefile.psp1.salamander || exit 1 -mv -f ../EBOOT.PBP ../psp1/pkg/EBOOT.PBP +make -C ../${PLATFORM}/kernelFunctionsPrx/ clean || exit 1 +make -C ../${PLATFORM}/kernelFunctionsPrx/ || exit 1 +cp -f ../kernel_functions.prx ../pkg/${PLATFORM}/kernel_functions.prx -make -C ../ -f Makefile.psp1 clean || exit 1 +make -C ../ -f Makefile.${PLATFORM}.salamander clean || exit 1 +make -C ../ -f Makefile.${PLATFORM}.salamander || exit 1 +mv -f ../EBOOT.PBP ../pkg/${PLATFORM}/EBOOT.PBP -for f in *_psp1.a ; do - name=`echo "$f" | sed 's/\(_libretro_psp1\|\).a$//'` +make -C ../ -f Makefile.${PLATFORM} clean || exit 1 + +for f in *_${PLATFORM}.a ; do + name=`echo "$f" | sed "s/\(_libretro_${PLATFORM}\|\).a$//"` whole_archive= big_stack= @@ -28,15 +30,15 @@ for f in *_psp1.a ; do fi if [ $big_stack="BIG_STACK=1" ] ; then - make -C ../ -f Makefile.psp1 clean || exit 1 + make -C ../ -f Makefile.${PLATFORM} clean || exit 1 fi - cp -f "$f" ../libretro_psp1.a - make -C ../ -f Makefile.psp1 $whole_archive $big_stack -j3 || exit 1 - mv -f ../EBOOT.PBP ../psp1/pkg/cores/${name}_libretro.PBP + cp -f "$f" ../libretro_${PLATFORM}.a + make -C ../ -f Makefile.${PLATFORM} $whole_archive $big_stack -j3 || exit 1 + mv -f ../EBOOT.PBP ../pkg/${PLATFORM}/cores/${name}_libretro.PBP rm -f ../retroarchpsp.elf if [ $big_stack="BIG_STACK=1" ] ; then - make -C ../ -f Makefile.psp1 clean || exit 1 + make -C ../ -f Makefile.${PLATFORM} clean || exit 1 fi done diff --git a/dist-scripts/vita-cores.sh b/dist-scripts/vita-cores.sh new file mode 100755 index 0000000000..7e53f0c823 --- /dev/null +++ b/dist-scripts/vita-cores.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +PLATFORM=vita + +#make -C ../ -f Makefile.${PLATFORM}.salamander clean || exit 1 +make -C ../ -f Makefile.griffin platform=${PLATFORM} clean || exit 1 + +#make -C ../ -f Makefile.${PLATFORM}.salamander || exit 1 +#make -C ../ -f Makefile.${PLATFORM}.salamander pkg || exit 1 + +for f in *_vita.a ; do + name=`echo "$f" | sed "s/\(_libretro_${PLATFORM}\|\).a$//"` + whole_archive= + big_stack= + if [ $name = "nxengine" ] ; then + echo "NXEngine found, applying whole archive linking..." + whole_archive="WHOLE_ARCHIVE_LINK=1" + fi + if [ $name = "tyrquake" ] ; then + echo "Tyrquake found, applying big stack..." + big_stack="BIG_STACK=1" + fi + cp -f "$f" ../libretro_${PLATFORM}.a + make -C ../ -f Makefile.griffin platform=${PLATFORM} $whole_archive $big_stack -j3 || exit 1 + mv -f ../retroarch_${PLATFORM}.velf ../pkg/${PLATFORM}/${name}_libretro_${PLATFORM}.velf + rm -f ../retroarch_${PLATFORM}.velf ../retroarch_${PLATFORM}.elf +done diff --git a/ngc/pkg/.empty b/pkg/psp1/.empty similarity index 100% rename from ngc/pkg/.empty rename to pkg/psp1/.empty diff --git a/pkg/vita/.empty b/pkg/vita/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/wii/.empty b/pkg/wii/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/wii/pkg/icon.png b/pkg/wii/icon.png similarity index 100% rename from wii/pkg/icon.png rename to pkg/wii/icon.png diff --git a/wii/pkg/meta.xml b/pkg/wii/meta.xml similarity index 100% rename from wii/pkg/meta.xml rename to pkg/wii/meta.xml