From 148146b9b59ec89e7c5c15cc2bf54bbcf063dd82 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 31 Jul 2015 08:22:50 +0200 Subject: [PATCH] Cleanups --- libretro-build-ios-theos.sh | 2 - libretro-build-ios.sh | 2 - libretro-build-ngc.sh | 2 - libretro-build-ps3.sh | 2 - libretro-build-psp1.sh | 2 - libretro-build-qnx.sh | 2 - libretro-build-sncps3.sh | 2 - libretro-build-wii.sh | 2 - libretro-build.sh | 79 +++++++++++++++++-------------------- 9 files changed, 36 insertions(+), 59 deletions(-) diff --git a/libretro-build-ios-theos.sh b/libretro-build-ios-theos.sh index 9c2d8299..53063900 100755 --- a/libretro-build-ios-theos.sh +++ b/libretro-build-ios-theos.sh @@ -14,6 +14,4 @@ else fi fi -# The theos build rules have all been moved to libretro-build.sh - platform=theos_ios ${BASE_DIR}/libretro-build.sh $@ diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh index a6f3349f..00d4ea9f 100755 --- a/libretro-build-ios.sh +++ b/libretro-build-ios.sh @@ -14,6 +14,4 @@ else fi fi -# The iOS build rules have all been moved to libretro-build.sh - platform=ios ${BASE_DIR}/libretro-build.sh $@ diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh index a366cf27..fe8bff8f 100755 --- a/libretro-build-ngc.sh +++ b/libretro-build-ngc.sh @@ -14,6 +14,4 @@ else fi fi -# The NGC build rules have all been moved to libretro-build.sh - platform=ngc ${BASE_DIR}/libretro-build.sh $@ diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh index 23ff3525..1377031b 100755 --- a/libretro-build-ps3.sh +++ b/libretro-build-ps3.sh @@ -14,8 +14,6 @@ else fi fi -# The PS3 build rules have all been moved to libretro-build.sh - if [[ -z "$1" ]]; then WANT_CORES=" \ fb_alpha \ diff --git a/libretro-build-psp1.sh b/libretro-build-psp1.sh index c9ba5eed..d6a7e3b8 100755 --- a/libretro-build-psp1.sh +++ b/libretro-build-psp1.sh @@ -14,6 +14,4 @@ else fi fi -# The PSP1 build rules have all been moved to libretro-build.sh - platform=psp1 ${BASE_DIR}/libretro-build.sh $@ diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh index 6103a952..1b375bf4 100755 --- a/libretro-build-qnx.sh +++ b/libretro-build-qnx.sh @@ -14,6 +14,4 @@ else fi fi -# The QNX build rules have all been moved to libretro-build.sh - platform=qnx ${BASE_DIR}/libretro-build.sh $@ diff --git a/libretro-build-sncps3.sh b/libretro-build-sncps3.sh index a6a4014b..71034383 100755 --- a/libretro-build-sncps3.sh +++ b/libretro-build-sncps3.sh @@ -14,8 +14,6 @@ else fi fi -# The SNC PS3 build rules have all been moved to libretro-build.sh - if [[ -z "$1" ]]; then WANT_CORES=" \ 2048 diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh index 3f9031fd..e3781803 100755 --- a/libretro-build-wii.sh +++ b/libretro-build-wii.sh @@ -14,6 +14,4 @@ else fi fi -# The Wii build rules have all been moved to libretro-build.sh - platform=wii ${BASE_DIR}/libretro-build.sh $@ diff --git a/libretro-build.sh b/libretro-build.sh index c4f43d2a..21e577c9 100755 --- a/libretro-build.sh +++ b/libretro-build.sh @@ -187,25 +187,15 @@ build_default_cores() { fi if [ $platform != "psp1" ] && [ $platform != "wii" ] && [ $platform != "ngc" ]; then - # (PSP/NGC/Wii) Performance issues + # (PSP/NGC/Wii) Performance and/or binary size issues libretro_build_core bsnes_cplusplus98 - if [ $platform != "psp1" ]; then - libretro_build_core mame078 - fi + libretro_build_core mame078 libretro_build_core mednafen_gba fi libretro_build_core mednafen_lynx libretro_build_core mednafen_ngp libretro_build_core mednafen_pce_fast - if [ $platform != "psp1" ] && [ $platform != "wii" ] && [ $platform != "ngc" ] && [ $platform != "ps3" ] && [ $platform != "sncps3" ]; then - # Excluded for performance reasons - libretro_build_core mednafen_pcfx - libretro_build_core mednafen_psx - if [ $platform != "qnx" ]; then - libretro_build_core mednafen_snes - fi - fi libretro_build_core mednafen_supergrafx libretro_build_core mednafen_vb @@ -214,9 +204,6 @@ build_default_cores() { libretro_build_core gw if [ $platform != "ps3" ] && [ $platform != "sncps3" ]; then - if [ $platform != "wii" ] && [ $platform != "ngc" ]; then - libretro_build_core lutro - fi libretro_build_core fuse fi @@ -225,20 +212,24 @@ build_default_cores() { build_default_cores_libretro_gl + libretro_build_core lutro + # (PS3/NGC/Wii) Excluded for performance reasons libretro_build_core snes9x libretro_build_core vbam - if [ $platform != "qnx" ] && [ $platform != "psp1" ]; then - # Just basic compilation issues right now for these platforms - libretro_build_core emux - fi - - # The only reason this won't be compiled in yet for PS3/Wii is - # 1) Wii/NGC - too big in binary size - # 2) PS3 - filesystem API issues if [ $platform != "psp1" ]; then + # The only reason ScummVM won't be compiled in yet is + # 1) Wii/NGC/PSP - too big in binary size + # 2) PS3 - filesystem API issues libretro_build_core scummvm + + # Excluded for performance reasons + libretro_build_core mednafen_pcfx + libretro_build_core mednafen_psx + if [ $platform != "qnx" ]; then + libretro_build_core mednafen_snes + fi fi # Could work on PS3/Wii right now but way too slow right now, @@ -248,32 +239,34 @@ build_default_cores() { # Compilation/port status issues libretro_build_core hatari libretro_build_core meteor - fi + if [ $platform != "qnx" ] && [ $platform != "psp1" ]; then + build_default_cores_cpp11 - if [ $platform != "qnx" ] && [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "psp1" ] && [ $platform != "ngc" ] && [ $platform != "wii" ]; then - build_default_cores_cpp11 + # Just basic compilation issues right now for these platforms + libretro_build_core emux - if [ $platform != "win" ]; then - # Reasons for not compiling this on Windows yet - - # (Windows) - Doesn't work properly - # (QNX) - Compilation issues - # (PSP1) - Performance/compilation issues - # (Wii) - Performance/compilation issues - # (PS3) - Performance/compilation issues - libretro_build_core pcsx_rearmed + if [ $platform != "win" ]; then + # Reasons for not compiling this on Windows yet - + # (Windows) - Doesn't work properly + # (QNX) - Compilation issues + # (PSP1) - Performance/compilation issues + # (Wii) - Performance/compilation issues + # (PS3) - Performance/compilation issues + libretro_build_core pcsx_rearmed + fi + + if [ $platform != "ios" ]; then + # Would need ffmpeg libraries baked in + libretro_build_core ffmpeg + libretro_build_core ppsspp + + libretro_build_core bnes + fi fi - if [ $platform != "ios" ]; then - # Would need ffmpeg libraries baked in - libretro_build_core ffmpeg - libretro_build_core ppsspp - - libretro_build_core bnes - fi + build_libretro_test fi - - build_libretro_test }