diff --git a/Makefile.ps3 b/Makefile.ps3 index 3ce514ed28..c2c7a0ed84 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -1,4 +1,4 @@ -RARCH_VERSION = "0.9.8" +RARCH_VERSION = "0.9.8.1" #which compiler to build with - GCC or SNC #set to GCC for debug builds for use with debugger @@ -154,7 +154,7 @@ create-salamander: $(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL) copy-media-files: - @cp $(RMENU_IMG_DIR)/main-menu_1080p.png ps3/pkg/USRDIR/cores/borders/Menu/main-menu.png + @cp -r $(RMENU_IMG_DIR)/*.png ps3/pkg/USRDIR/cores/borders/Menu/ create-shaders: make -f Makefile.shaders deploy-ps3 diff --git a/dist-scripts/ps3-cores-cex-355.sh b/dist-scripts/ps3-cores-cex-355.sh new file mode 100755 index 0000000000..c299b12409 --- /dev/null +++ b/dist-scripts/ps3-cores-cex-355.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +make -C ../ -f Makefile.ps3.salamander clean || exit 1 +make -C ../ -f Makefile.ps3.rgl clean || exit 1 +make -C ../ -f Makefile.ps3 clean || exit 1 + +make -C ../ -f Makefile.ps3.salamander || exit 1 +make -C ../ -f Makefile.ps3.rgl || exit 1 + +EXE_PATH=/usr/local/cell/host-win32/bin + +for f in *_ps3.a ; do + name=`echo "$f" | sed 's/\(_libretro\|\)_ps3.a$//'` + cp -f "$f" ../libretro_ps3.a + make -C ../ -f Makefile.ps3 -j3 || exit 1 + make_self_wc retroarch_ps3.elf "$name.dol" + rm -f ../retroarch_ps3.elf ../retroarch_ps3.self +done + +cp -r ../media/rmenu/*.png ../ps3/pkg/USRDIR/cores/borders/Menu/ + +make -C ../ -f Makefile.shaders deploy-ps3 + +make_fself_wc ../retroarch-salamander_ps3.elf ../ps3/pkg/USRDIR/EBOOT.BIN +rm -rf ../retroarch-salamander_ps3.elf +python2 ../ps3/ps3py/pkg.py --contentid UP0001-SSNE10000_00-0000000000000001 ../ps3/pkg/ retroarch-ps3-cfw-0.9.8.1.pkg diff --git a/dist-scripts/ps3-cores-dex.sh b/dist-scripts/ps3-cores-dex.sh new file mode 100755 index 0000000000..e66528d564 --- /dev/null +++ b/dist-scripts/ps3-cores-dex.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +make -C ../ -f Makefile.ps3.salamander clean || exit 1 +make -C ../ -f Makefile.ps3.rgl clean || exit 1 +make -C ../ -f Makefile.ps3 clean || exit 1 + +make -C ../ -f Makefile.ps3.salamander || exit 1 +make -C ../ -f Makefile.ps3.rgl || exit 1 + +EXE_PATH=/usr/local/cell/host-win32/bin +MAKE_FSELF_NPDRM=$EXE_PATH/make_fself_npdrm.exe +MAKE_PACKAGE_NPDRM=$EXE_PATH/make_package_npdrm.exe + +for f in *_ps3.a ; do + name=`echo "$f" | sed 's/\(_libretro\|\)_ps3.a$//'` + cp -f "$f" ../libretro_ps3.a + make -C ../ -f Makefile.ps3 -j3 || exit 1 + $MAKE_FSELF_NPDRM ../retroarch_ps3.elf ../CORE.SELF + mv -f ../CORE.SELF ../ps3/pkg/USRDIR/cores/"$name.SELF" + rm -f ../retroarch_ps3.elf ../retroarch_ps3.self ../CORE.SELF +done + +cp -r ../media/rmenu/*.png ../ps3/pkg/USRDIR/cores/borders/Menu/ + +make -C ../ -f Makefile.shaders deploy-ps3 + +$MAKE_FSELF_NPDRM ../retroarch-salamander_ps3.elf ../ps3/pkg/USRDIR/EBOOT.BIN +rm -rf ../retroarch-salamander_ps3.elf +$MAKE_PACKAGE_NPDRM ../ps3/pkg/package.conf ../ps3/pkg diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index bf0dbbc6ec..f62599c743 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -293,7 +293,7 @@ static void get_environment_settings(int argc, char *argv[]) /* now we fill in all the variables */ snprintf(default_paths.border_file, sizeof(default_paths.border_file), "%s/borders/Centered-1080p/mega-man-2.png", default_paths.core_dir); - snprintf(default_paths.menu_border_file, sizeof(default_paths.menu_border_file), "%s/borders/Menu/main-menu.png", default_paths.core_dir); + snprintf(default_paths.menu_border_file, sizeof(default_paths.menu_border_file), "%s/borders/Menu/main-menu_1080p.png", default_paths.core_dir); snprintf(default_paths.cgp_dir, sizeof(default_paths.cgp_dir), "%s/presets", default_paths.core_dir); snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/input", default_paths.cgp_dir); snprintf(default_paths.border_dir, sizeof(default_paths.border_dir), "%s/borders", default_paths.core_dir); diff --git a/media/rmenu/captain-cpsx.png b/media/rmenu/captain-cpsx.png new file mode 100644 index 0000000000..f9f6e34946 Binary files /dev/null and b/media/rmenu/captain-cpsx.png differ