From ef5dabea4e1ff8d49e050dcc89e973f67fd3d56d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 11 Jul 2015 04:21:29 +0200 Subject: [PATCH] (PS3) Start making libretro-build-ps3.sh work with new rules - note - doesn't respect COMPILER_TARGET_ALT yet --- libretro-build-ps3.sh | 50 +++++++++++-------------------------------- libretro-config.sh | 17 +++++++++++++++ rules.d/core-rules.sh | 4 ++-- 3 files changed, 31 insertions(+), 40 deletions(-) diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh index c7816b01..a0ff248a 100755 --- 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 $@ diff --git a/libretro-config.sh b/libretro-config.sh index e5471efc..35c27822 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -35,6 +35,16 @@ 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 + + CC="ppu-lv2-gcc.exe" + CXX="ppu-lv2-g++.exe" + ;; + theos_ios) DIST_DIR="theos_ios" BUILD_PRODUCT_PREFIX="objs/obj" @@ -126,6 +136,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" diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index 089d56b7..ce708982 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -8,12 +8,12 @@ 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 -psp1 -wii libretro_snes9x_name="SNES9x" libretro_snes9x_git_url="https://github.com/libretro/snes9x.git" libretro_snes9x_build_subdir="libretro" -register_module core "snes9x_next" -ps3 +register_module core "snes9x_next" libretro_snes9x_next_name="SNES9x Next" libretro_snes9x_next_git_url="https://github.com/libretro/snes9x-next.git" libretro_snes9x_next_build_makefile="Makefile.libretro"