Merge branch 'master' of github.com:libretro/libretro-super

2015-07-11 00:11:42 -04:00 · 2015-07-11 00:11:42 -04:00 · ed31adad1f
parent 58ed7ebdaa 2786d9906e
commit ed31adad1f
4 changed files with 68 additions and 47 deletions
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@ -1,45 +1,19 @@
 #! /usr/bin/env bash
 # vim: set ts=3 sw=3 noet ft=sh : bash

-SCRIPT=$(readlink -f $0)
-BASE_DIR=$(dirname $SCRIPT)
+SCRIPT="${0#./}"
+BASE_DIR="${SCRIPT%/*}"
 WORKDIR="$PWD"
-RARCH_DIR=$BASE_DIR/dist
-RARCH_DIST_DIR=$RARCH_DIR/ps3
-FORMAT=_ps3
-FORMAT_COMPILER_TARGET=ps3
-FORMAT_COMPILER_TARGET_ALT=sncps3
-FORMAT_EXT=a
-JOBS=7
-MAKE=make

-. "$BASE_DIR/libretro-build-common.sh"
-
-if [ $1 ]; then
-	$1
+if [ "$BASE_DIR" = "$SCRIPT" ]; then
+	BASE_DIR="$WORKDIR"
 else
-	libretro_build_core fb_alpha
-	libretro_build_core fceumm
-	libretro_build_core gambatte
-	libretro_build_core genesis_plus_gx
-	libretro_build_core handy
-	libretro_build_core mame078
-	libretro_build_core mednafen_bsnes
-	libretro_build_core mednafen_gba
-	libretro_build_core mednafen_lynx
-	libretro_build_core mednafen_ngp
-	libretro_build_core mednafen_pce_fast
-	libretro_build_core mednafen_pcfx
-	libretro_build_core mednafen_psx
-	libretro_build_core mednafen_supergrafx
-	libretro_build_core mednafen_vb
-	libretro_build_core mednafen_wswan
-	libretro_build_core nestopia
-	libretro_build_core nxengine
-	libretro_build_core prboom
-	libretro_build_core quicknes
-	libretro_build_core snes9x_next
-	libretro_build_core stella
-	libretro_build_core tyrquake
-	libretro_build_core vba_next
+	if [[ "$0" != /* ]]; then
+		# Make the path absolute
+		BASE_DIR="$WORKDIR/$BASE_DIR"
+	fi
 fi
+
+# The PS3 build rules have all been moved to libretro-build.sh
+
+platform=ps3 ${BASE_DIR}/libretro-build.sh $@
--- a/libretro-build-sncps3.sh
+++ b/libretro-build-sncps3.sh
@ -0,0 +1,19 @@
+#! /usr/bin/env bash
+# vim: set ts=3 sw=3 noet ft=sh : bash
+
+SCRIPT="${0#./}"
+BASE_DIR="${SCRIPT%/*}"
+WORKDIR="$PWD"
+
+if [ "$BASE_DIR" = "$SCRIPT" ]; then
+	BASE_DIR="$WORKDIR"
+else
+	if [[ "$0" != /* ]]; then
+		# Make the path absolute
+		BASE_DIR="$WORKDIR/$BASE_DIR"
+	fi
+fi
+
+# The SNC PS3 build rules have all been moved to libretro-build.sh
+
+platform=sncps3 ${BASE_DIR}/libretro-build.sh $@
--- a/libretro-config.sh
+++ b/libretro-config.sh
@ -35,6 +35,27 @@ case "$platform" in
 		CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -marm -miphoneos-version-min=5.0 -isysroot $IOSSDK"
 		;;

+	ps3)
+		DIST_DIR="ps3"
+		FORMAT_EXT=a
+		FORMAT_COMPILER_TARGET=ps3
+		FORMAT_COMPILER_TARGET_ALT=sncps3
+		FORMAT=_ps3
+
+		CC="ppu-lv2-gcc.exe"
+		CXX="ppu-lv2-g++.exe"
+		;;
+
+	sncps3)
+		DIST_DIR="ps3"
+		FORMAT_EXT=a
+		FORMAT_COMPILER_TARGET=sncps3
+		FORMAT=_ps3
+
+		CC="$CELL_SDK/host-win32/sn/bin/ps3ppusnc.exe"
+		CXX="$CELL_SDK/host-win32/sn/bin/ps3ppusnc.exe"
+		;;
+
 	theos_ios)
 		DIST_DIR="theos_ios"
 		BUILD_PRODUCT_PREFIX="objs/obj"
@ -126,6 +147,13 @@ case "$platform" in
 					FORMAT_COMPILER_TARGET="psp1"
 					DIST_DIR="psp1"
 					;;
+				*ps3*)
+					platform=ps3
+					FORMAT_EXT="a"
+					FORMAT_COMPILER_TARGET="ps3"
+					FORMAT_COMPILER_TARGET_ALT="sncps3"
+					DIST_DIR="ps3"
+					;;
 				*wii*)
 					platform=wii
 					FORMAT_EXT="a"
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@ -1,6 +1,6 @@
 # vim: set ts=3 sw=3 noet ft=sh : bash

-register_module core "bsnes" -theos_ios -ngc -ps3 -psp1 -qnx -wii
+register_module core "bsnes" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
 libretro_bsnes_name="bsnes/higan"
 libretro_bsnes_git_url="https://github.com/libretro/bsnes-libretro.git"
 libretro_bsnes_build_makefile_targets="profile=\"accuracy\" profile=\"balanced\" profile=\"performance\""
@ -8,7 +8,7 @@ libretro_bsnes_build_args="compiler=\"${CXX11}\""
 libretro_bsnes_build_products="out"
 libretro_bsnes_build_cores="bsnes_accuracy bsnes_balanced bsnes_performance"

-register_module core "snes9x" -ngc -ps3 -psp1 -wii
+register_module core "snes9x" -ngc -sncps3 -ps3 -psp1 -wii
 libretro_snes9x_name="SNES9x"
 libretro_snes9x_git_url="https://github.com/libretro/snes9x.git"
 libretro_snes9x_build_subdir="libretro"
@ -265,7 +265,7 @@ libretro_dinothawr_name="Dinothawr"
 libretro_dinothawr_git_url="https://github.com/libretro/Dinothawr.git"
 libretro_dinothawr_build_platform="$FORMAT_COMPILER_TARGET_ALT"

-register_module core "3dengine" -ngc -ps3 -psp1 -wii
+register_module core "3dengine" -ngc -sncps3 -ps3 -psp1 -wii
 libretro_3dengine_name="3DEngine"
 libretro_3dengine_git_url="https://github.com/libretro/libretro-3dengine.git"
 libretro_3dengine_build_opengl=yes
@ -284,7 +284,7 @@ register_module core "fmsx" -ps3
 libretro_fmsx_name="fMSX"
 libretro_fmsx_git_url="https://github.com/libretro/fmsx-libretro.git"

-register_module core "2048" -ngc -ps3 -wii
+register_module core "2048" -ngc -sncps3 -ps3 -wii
 libretro_2048_git_url="https://github.com/libretro/libretro-2048.git"
 libretro_2048_build_makefile="Makefile.libretro"

@ -307,7 +307,7 @@ register_module core "o2em" -ngc -ps3 -wii
 libretro_o2em_name="O2EM"
 libretro_o2em_git_url="https://github.com/libretro/libretro-o2em.git"

-register_module core "4do" -ngc -ps3 -psp1 -wii
+register_module core "4do" -ngc -sncps3 -ps3 -psp1 -wii
 libretro_4do_name="4DO"
 libretro_4do_git_url="https://github.com/libretro/4do-libretro.git"

@ -332,23 +332,23 @@ libretro_tempgba_name="TempGBA"
 libretro_tempgba_git_url="https://github.com/libretro/TempGBA-libretro.git"
 libretro_tempgba_build_rule=none # NEED A BUILD RULE

-register_module core "gpsp" -ngc -ps3 -psp1 -wii
+register_module core "gpsp" -ngc -sncps3 -ps3 -psp1 -wii
 libretro_gpsp_name="gpSP"
 libretro_gpsp_git_url="https://github.com/libretro/gpsp.git"

-register_module core "emux" -theos_ios -ngc -ps3 -psp1 -qnx -wii
+register_module core "emux" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
 libretro_emux_name="Emux"
 libretro_emux_git_url="https://github.com/libretro/emux.git"
 libretro_emux_build_subdir=libretro
 libretro_emux_build_cores="emux_chip8 emux_gb emux_nes emux_sms"

-register_module core "fuse" -theos_ios -ngc -ps3 -psp1 -qnx -wii
+register_module core "fuse" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
 libretro_fuse_name="Fuse"
 libretro_fuse_git_url="https://github.com/libretro/fuse-libretro.git"
 libretro_fuse_build_makefile="Makefile.libretro"
 libretro_fuse_build_platform="$FORMAT_COMPILER_TARGET_ALT"

-register_module core "gw" -theos_ios -ngc -ps3 -psp1 -qnx -wii
+register_module core "gw" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
 libretro_gw_name="Game & Watch"
 libretro_gw_git_url="https://github.com/libretro/gw-libretro.git"
 libretro_gw_git_submodules="yes"