From 68c3522b7d82cb98b1ee0bcbee9644a308ec9694 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 22 Aug 2014 13:31:46 +0200 Subject: [PATCH] Take out modelviewer/instancingviewer/scenewalker cores - 3DEngine replaces most of these --- libretro-build-android-mk.sh | 106 ----------------------------------- libretro-build-common.sh | 99 -------------------------------- libretro-build-ios.sh | 4 -- libretro-build-qnx.sh | 4 -- libretro-build.sh | 5 -- libretro-fetch.sh | 5 -- 6 files changed, 223 deletions(-) diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh index 57140df6..66345afd 100755 --- a/libretro-build-android-mk.sh +++ b/libretro-build-android-mk.sh @@ -286,112 +286,10 @@ build_libretro_mupen64() build_libretro_generic_makefile_libretrodir "mupen64plus" } -build_libretro_modelviewer() -{ - CORENAME="gl-modelviewer" - cd $BASE_DIR - if [ -d "libretro-${CORENAME}" ]; then - echo "=== Building ${CORENAME} ===" - cd libretro-${CORENAME} - cd jni - for a in "${ABIS[@]}"; do - if [ -z "${NOCLEAN}" ]; then - ndk-build clean APP_ABI=${a} || die "Failed to clean ${a} ${CORENAME}" - fi - ndk-build -j$JOBS APP_ABI=${a} || die "Failed to build ${a} ${CORENAME}" - cp ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/modelviewer_libretro${FORMAT}.${FORMAT_EXT} - done - else - echo "${CORENAME} not fetched, skipping ..." - fi -} - -build_libretro_modelviewer_location() -{ - CORENAME="gl-modelviewer-location" - cd $BASE_DIR - if [ -d "libretro-${CORENAME}" ]; then - echo "=== Building ${CORENAME} ===" - cd libretro-${CORENAME} - cd jni - for a in "${ABIS[@]}"; do - if [ -z "${NOCLEAN}" ]; then - ndk-build clean APP_ABI=${a} || die "Failed to clean ${a} ${CORENAME}" - fi - ndk-build -j$JOBS APP_ABI=${a} || die "Failed to build ${a} ${CORENAME}" - cp ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/modelviewer_location_libretro${FORMAT}.${FORMAT_EXT} - done - else - echo "${CORENAME} not fetched, skipping ..." - fi -} - -build_libretro_instancingviewer() -{ - CORENAME="gl-instancingviewer" - cd $BASE_DIR - if [ -d "libretro-${CORENAME}" ]; then - echo "=== Building ${CORENAME} ===" - cd libretro-${CORENAME} - cd jni - for a in "${ABIS[@]}"; do - if [ -z "${NOCLEAN}" ]; then - ndk-build clean APP_ABI=${a} || die "Failed to clean ${a} ${CORENAME}" - fi - ndk-build -j$JOBS APP_ABI=${a} || die "Failed to build ${a} ${CORENAME}" - cp ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/instancingviewer_location_libretro${FORMAT}.${FORMAT_EXT} - done - else - echo "${CORENAME} not fetched, skipping ..." - fi -} - -build_libretro_instancingviewer_camera() -{ - CORENAME="gl-instancingviewer-camera" - cd $BASE_DIR - if [ -d "libretro-${CORENAME}" ]; then - echo "=== Building ${CORENAME} ===" - cd libretro-${CORENAME} - cd jni - for a in "${ABIS[@]}"; do - if [ -z "${NOCLEAN}" ]; then - ndk-build clean APP_ABI=${a} || die "Failed to clean ${a} ${CORENAME}" - fi - ndk-build -j$JOBS APP_ABI=${a} || die "Failed to build ${a} ${CORENAME}" - cp ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/instancingviewer_camera_libretro${FORMAT}.${FORMAT_EXT} - done - else - echo "${CORENAME} not fetched, skipping ..." - fi -} - build_libretro_3dengine() { build_libretro_generic_makefile_rootdir "3dengine" } -build_libretro_scenewalker() -{ - CORENAME="gl-scenewalker" - cd $BASE_DIR - if [ -d "libretro-${CORENAME}" ]; then - echo "=== Building ${CORENAME} ===" - cd libretro-${CORENAME} - cd jni - for a in "${ABIS[@]}"; do - if [ -z "${NOCLEAN}" ]; then - ndk-build clean APP_ABI=${a} || die "Failed to clean ${a} ${CORENAME}" - fi - ndk-build -j$JOBS APP_ABI=${a} || die "Failed to build ${a} ${CORENAME}" - cp ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/scenewalker_libretro${FORMAT}.${FORMAT_EXT} - done - else - echo "${CORENAME} not fetched, skipping ..." - fi -} - - - build_libretro_desmume() { CORENAME="desmume" @@ -501,10 +399,6 @@ else build_libretro_handy build_libretro_desmume build_libretro_pcsx_rearmed - build_libretro_modelviewer - build_libretro_scenewalker - build_libretro_instancingviewer - build_libretro_instancingviewer_camera build_libretro_mupen64 #build_libretro_ffmpeg build_libretro_yabause diff --git a/libretro-build-common.sh b/libretro-build-common.sh index ae17f552..7428fb5c 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -488,105 +488,6 @@ rebuild_libretro_ume() { fi } - -build_libretro_modelviewer() { - check_opengl - cd "${BASE_DIR}" - if [ -d 'libretro-gl-modelviewer' ]; then - echo '=== Building Modelviewer (GL) ===' - cd libretro-gl-modelviewer - - if [ -z "${NOCLEAN}" ]; then - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean Modelviewer' - fi - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build Modelviewer' - cp "modelviewer_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" - else - echo 'ModelViewer not fetched, skipping ...' - fi - # reset check_opengl - export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}" -} - -build_libretro_modelviewer_location() { - check_opengl - cd "${BASE_DIR}" - if [ -d 'libretro-gl-modelviewer-location' ]; then - echo '=== Building Modelviewer Location (GL) ===' - cd libretro-gl-modelviewer-location - - if [ -z "${NOCLEAN}" ]; then - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean Modelviewer Location' - fi - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build Modelviewer Location' - cp "modelviewer_location_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" - else - echo 'ModelViewer Location not fetched, skipping ...' - fi - # reset check_opengl - export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}" -} - - -build_libretro_scenewalker() { - check_opengl - cd "${BASE_DIR}" - if [ -d 'libretro-gl-scenewalker' ]; then - echo '=== Building SceneWalker (GL) ===' - cd libretro-gl-scenewalker - - if [ -z "${NOCLEAN}" ]; then - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean SceneWalker' - fi - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build SceneWalker' - cp "scenewalker_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" - else - echo 'SceneWalker not fetched, skipping ...' - fi - # reset check_opengl - export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}" -} - -build_libretro_instancingviewer() { - check_opengl - cd "${BASE_DIR}" - if [ -d 'libretro-gl-instancingviewer' ]; then - echo '=== Building Instancing Viewer (GL) ===' - cd libretro-gl-instancingviewer - - if [ -z "${NOCLEAN}" ]; then - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean InstancingViewer' - fi - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build InstancingViewer' - cp "instancingviewer_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" - else - echo 'InstancingViewer not fetched, skipping ...' - fi - # reset check_opengl - export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}" -} - -build_libretro_instancingviewer_camera() { - check_opengl - cd "${BASE_DIR}" - if [ -d 'libretro-gl-instancingviewer-camera' ]; then - echo '=== Building Instancing Viewer Camera (GL) ===' - cd libretro-gl-instancingviewer-camera - - if [ -z "${NOCLEAN}" ]; then - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean InstancingViewer-Camera' - fi - "${MAKE}" -f Makefile platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build InstancingViewer-Camera' - cp "instancingviewer_camera_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" - else - echo 'InstancingViewer Camera not fetched, skipping ...' - fi - # reset check_opengl - export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}" -} - - - build_libretro_bsnes_mercury() { cd "${BASE_DIR}" if [ -d 'libretro-bsnes-mercury/perf' ]; then diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh index ee527ea2..a968a5ce 100755 --- a/libretro-build-ios.sh +++ b/libretro-build-ios.sh @@ -66,10 +66,6 @@ else build_libretro_desmume build_libretro_pcsx_rearmed build_libretro_pcsx_rearmed_interpreter - build_libretro_modelviewer - build_libretro_scenewalker - build_libretro_instancingviewer - build_libretro_instancingviewer_camera build_libretro_mupen64 build_libretro_yabause #build_libretro_ffmpeg diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh index 7c6358d1..1fdb608c 100755 --- a/libretro-build-qnx.sh +++ b/libretro-build-qnx.sh @@ -54,10 +54,6 @@ else build_libretro_handy #build_libretro_desmume build_libretro_pcsx_rearmed - build_libretro_modelviewer - build_libretro_scenewalker - build_libretro_instancingviewer - build_libretro_instancingviewer_camera #build_libretro_mupen64 #build_libretro_yabause #build_libretro_ffmpeg diff --git a/libretro-build.sh b/libretro-build.sh index 99bb5a0c..bca9a8f8 100755 --- a/libretro-build.sh +++ b/libretro-build.sh @@ -142,11 +142,6 @@ else build_libretro_prosystem build_libretro_dinothawr build_libretro_virtualjaguar - build_libretro_modelviewer - build_libretro_modelviewer_location - build_libretro_scenewalker - build_libretro_instancingviewer - build_libretro_instancingviewer_camera build_libretro_mupen64 build_libretro_ffmpeg build_libretro_3dengine diff --git a/libretro-fetch.sh b/libretro-fetch.sh index 0612c00d..4a00a6b8 100755 --- a/libretro-fetch.sh +++ b/libretro-fetch.sh @@ -146,17 +146,12 @@ fetch_project "$REPO_BASE/libretro/virtualjaguar-libretro.git" "libretro-virtual fetch_project "$REPO_BASE/libretro/mame2003-libretro.git" "libretro-mame078" "libretro/mame078" fetch_project "$REPO_BASE/libretro/mame2010-libretro.git" "libretro-mame139" "libretro/mame139" fetch_project "$REPO_BASE/libretro/libretro-mame.git" "libretro-mame" "libretro/mame" -fetch_project "$REPO_BASE/libretro/scenewalker-libretro.git" "libretro-gl-scenewalker" "libretro/SceneWalker" -fetch_project "$REPO_BASE/libretro/modelviewer-libretro.git" "libretro-gl-modelviewer" "libretro/ModelViewer" -fetch_project "$REPO_BASE/libretro/modelviewer-location-libretro.git" "libretro-gl-modelviewer-location" "libretro/ModelViewer-Location" fetch_project "$REPO_BASE/libretro/FFmpeg.git" "libretro-ffmpeg" "libretro/FFmpeg" fetch_project "$REPO_BASE/libretro/bsnes-libretro-cplusplus98.git" "libretro-bsnes-cplusplus98" "libretro/bsnes-cplusplus98" fetch_project "$REPO_BASE/libretro/bsnes-mercury.git" "libretro-bsnes-mercury" "libretro/bsnes-mercury" fetch_project_submodule "$REPO_BASE/libretro/picodrive.git" "libretro-picodrive" "libretro/picodrive" fetch_project "$REPO_BASE/libretro/tgbdual-libretro.git" "libretro-tgbdual" "libretro/tgbdual" fetch_project "$REPO_BASE/libretro/mupen64plus-libretro.git" "libretro-mupen64plus" "libretro/mupen64plus" -fetch_project "$REPO_BASE/libretro/instancingviewer-libretro-gl.git" "libretro-gl-instancingviewer" "libretro/instancingviewer" -fetch_project "$REPO_BASE/libretro/instancingviewer-camera.git" "libretro-gl-instancingviewer-camera" "libretro/instancingviewer-camera" fetch_project "$REPO_BASE/libretro/Dinothawr.git" "libretro-dinothawr" "libretro/Dinothawr" fetch_project "$REPO_BASE/libretro/hatari-libretro.git" "libretro-hatari" "libretro/Hatari" fetch_project "$REPO_BASE/libretro/libretro-uae.git" "libretro-uae" "libretro/UAE"