From 9724b2478825aa31c7f869abe25bbd65b82b4fcb Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 18 May 2013 02:53:55 +0200 Subject: [PATCH] Add ModelViewer and SceneWalker build targets for iOS, QNX and PC --- libretro-build-common-console.sh | 28 ++++++++++++++++++++++++++ libretro-build-ios.sh | 2 ++ libretro-build-qnx.sh | 2 ++ libretro-build-win32.sh | 2 ++ libretro-build.sh | 34 ++++++++++++++++++++++++++++++++ libretro-config.sh | 3 +++ 6 files changed, 71 insertions(+) diff --git a/libretro-build-common-console.sh b/libretro-build-common-console.sh index ab848c3d..41285fb9 100644 --- a/libretro-build-common-console.sh +++ b/libretro-build-common-console.sh @@ -254,6 +254,34 @@ build_libretro_tyrquake() fi } +build_libretro_modelviewer() +{ + cd $BASE_DIR + if [ -d "libretro-gl-modelviewer" ]; then + echo "=== Building Modelviewer (GL) ===" + cd libretro-gl-modelviewer + make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean Modelviewer" + make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build Modelviewer" + cp modelviewer_libretro.${FORMAT_EXT} "$RARCH_DIST_DIR" + else + echo "ModelViewer not fetched, skipping ..." + fi +} + +build_libretro_scenewalker() +{ + cd $BASE_DIR + if [ -d "libretro-gl-scenewalker" ]; then + echo "=== Building SceneWalker (GL) ===" + cd libretro-gl-scenewalker + make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean SceneWalker" + make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build SceneWalker" + cp scenewalker_libretro.${FORMAT_EXT} "$RARCH_DIST_DIR" + else + echo "SceneWalker not fetched, skipping ..." + fi +} + create_dist_dir() { if [ -d $RARCH_DIR ]; then diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh index cd195186..9cbf4342 100755 --- a/libretro-build-ios.sh +++ b/libretro-build-ios.sh @@ -34,4 +34,6 @@ else build_libretro_desmume build_libretro_nestopia build_libretro_tyrquake + build_libretro_modelviewer + build_libretro_scenewalker fi diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh index 5bb62166..165da944 100755 --- a/libretro-build-qnx.sh +++ b/libretro-build-qnx.sh @@ -31,4 +31,6 @@ else #build_libretro_desmume build_libretro_nestopia build_libretro_tyrquake + build_libretro_modelviewer + build_libretro_scenewalker fi diff --git a/libretro-build-win32.sh b/libretro-build-win32.sh index f6f7bb10..5454fbb6 100755 --- a/libretro-build-win32.sh +++ b/libretro-build-win32.sh @@ -321,4 +321,6 @@ else build_libretro_desmume build_libretro_quicknes build_libretro_nestopia + build_libretro_modelviewer + build_libretro_scenewalker fi diff --git a/libretro-build.sh b/libretro-build.sh index fe6bd554..56eb5deb 100755 --- a/libretro-build.sh +++ b/libretro-build.sh @@ -1,5 +1,7 @@ #!/bin/sh +. ./libretro-config.sh + UNAME=$(uname) if [ "`echo $UNAME | grep Linux`" ]; then FORMAT_EXT="so" @@ -431,6 +433,34 @@ build_libretro_scummvm() fi } +build_libretro_modelviewer() +{ + cd $BASE_DIR + if [ -d "libretro-gl-modelviewer" ]; then + echo "=== Building Modelviewer (GL) ===" + cd libretro-gl-modelviewer + make -f Makefile -j$JOBS clean || die "Failed to clean Modelviewer" + make -f Makefile -j$JOBS || die "Failed to build Modelviewer" + cp modelviewer_libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/libretro-gl-modelviewer.${FORMAT_EXT} + else + echo "ModelViewer not fetched, skipping ..." + fi +} + +build_libretro_scenewalker() +{ + cd $BASE_DIR + if [ -d "libretro-gl-scenewalker" ]; then + echo "=== Building SceneWalker (GL) ===" + cd libretro-gl-scenewalker + make -f Makefile -j$JOBS clean || die "Failed to clean SceneWalker" + make -f Makefile -j$JOBS || die "Failed to build SceneWalker" + cp scenewalker_libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/libretro-gl-scenewalker.${FORMAT_EXT} + else + echo "SceneWalker not fetched, skipping ..." + fi +} + mkdir -p "$RARCH_DIST_DIR" if [ $1 ]; then @@ -458,4 +488,8 @@ else build_libretro_mame078 build_libretro_dosbox build_libretro_scummvm +if [ -z $BUILD_LIBRETRO_GL ]; then + build_libretro_modelviewer + build_libretro_scenewalker +fi fi diff --git a/libretro-config.sh b/libretro-config.sh index e0af7c19..1dcf4204 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -2,3 +2,6 @@ #if uncommented, will fetch repos with read+write access. Useful for committers #export WRITERIGHTS + +#if uncommented, will build libretro GL cores as well. Doesn't need to be defined for mobile platforms +#export BUILD_LIBRETRO_GL