Merge pull request #2094 from aliaspider/master

some dist-cores.sh fixes
This commit is contained in:
Twinaphex 2015-09-07 18:54:14 +02:00
commit f82006959e

View File

@ -16,7 +16,6 @@ mkdir -p ../pkg/${platform}/cores/
make -C ../${platform}/kernel_functions_prx/ clean || exit 1
make -C ../${platform}/kernel_functions_prx/ || exit 1
cp -f ../kernel_functions.prx ../pkg/${platform}/kernel_functions.prx
mv -f ../EBOOT.PBP ../pkg/${platform}/EBOOT.PBP
# Vita
elif [ $PLATFORM = "vita" ] ; then
@ -72,17 +71,17 @@ platform=ps3
SALAMANDER=yes
EXT=a
GENPS3ISO_PATH=/cygdrive/c/Cobra_ODE_GenPS3iso_v2.3/genps3iso.exe
GENPS3ISO_PATH=/cygdrive/c/Cobra_ODE_GenPS3iso_v2.3/genps3iso.exe
SCETOOL_PATH=/cygdrive/c/Users/aaa801/ps3tools/ps3tools/tools/scetool/scetool.exe
SCETOOL_FLAGS="--sce-type SELF --compress-data FALSE --self-type APP --key-revision 0004 --self-fw-version 0003004100000000 --self-app-version 0001000000000000 --self-auth-id 1010000001000003 --self-vendor-id 01000002 --self-cap-flags 00000000000000000000000000000000000000000000003b0000000100040000"
fi
# Cleanup Salamander core if it exists
# Cleanup Salamander core if it exists
if [ $SALAMANDER = "yes" ]; then
make -C ../ -f Makefile.${platform}.salamander clean || exit 1
fi
# Cleanup existing core if it exists
# Cleanup existing core if it exists
if [ $PLATFORM = "ode-ps3" ]; then
make -C ../ -f Makefile.${platform}.cobra clean || exit 1
elif [ $MAKEFILE_GRIFFIN = "yes" ]; then
@ -94,6 +93,9 @@ fi
# Compile Salamander core
if [ $SALAMANDER = "yes" ]; then
make -C ../ -f Makefile.${platform}.salamander || exit 1
if [ $PLATFORM = "psp1" ] ; then
mv -f ../EBOOT.PBP ../pkg/${platform}/EBOOT.PBP
fi
fi
for f in *_${platform}.${EXT} ; do
@ -113,7 +115,7 @@ for f in *_${platform}.${EXT} ; do
cp -f "$f" ../libretro_${platform}.${EXT}
# Do cleanup if this is a big stack core
if [ $big_stack="BIG_STACK=1" ] ; then
if [ "$big_stack" = "BIG_STACK=1" ] ; then
if [ $MAKEFILE_GRIFFIN = "yes" ]; then
make -C ../ -f Makefile.griffin platform=${platform} clean || exit 1
elif [ $PLATFORM = "emscripten" ]; then
@ -134,7 +136,7 @@ for f in *_${platform}.${EXT} ; do
make -C ../ -f Makefile.${platform} $whole_archive $big_stack -j3 || exit 1
fi
# Do manual executable step
# Do manual executable step
if [ $PLATFORM = "dex-ps3" ] ; then
$MAKE_FSELF_NPDRM ../retroarch_${platform}.elf ../CORE.SELF
elif [ $PLATFORM = "cex-ps3" ] ; then
@ -178,7 +180,7 @@ for f in *_${platform}.${EXT} ; do
fi
# Do cleanup if this is a big stack core
if [ $big_stack="BIG_STACK=1" ] ; then
if [ "$big_stack" = "BIG_STACK=1" ] ; then
if [ $MAKEFILE_GRIFFIN = "yes" ]; then
make -C ../ -f Makefile.griffin platform=${platform} clean || exit 1
elif [ $PLATFORM = "emscripten" ]; then