Fixup bsnes.

This commit is contained in:
Themaister 2013-05-19 10:55:09 +02:00
parent 812ba64795
commit 4fd17c5905
2 changed files with 11 additions and 14 deletions

View File

@ -401,7 +401,6 @@ build_libretro_dosbox()
fi
}
# FIXME - needs to be fixed
build_libretro_bsnes()
{
cd "$BASE_DIR"
@ -410,9 +409,8 @@ build_libretro_bsnes()
cd libretro-bsnes/perf/higan
rm -f obj/*.o
rm -f out/*.${FORMAT_EXT}
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=performance -j$JOBS clean || die "Failed to clean bSNES performance core"
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=performance -j$JOBS || die "Failed to build bSNES performance core"
cp -f out/retro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_performance.${FORMAT_EXT}
cp -f out/bsnes_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_performance.${FORMAT_EXT}
else
echo "bSNES performance not fetched, skipping ..."
fi
@ -423,9 +421,8 @@ build_libretro_bsnes()
cd libretro-bsnes/balanced/higan
rm -f obj/*.o
rm -f out/*.${FORMAT_EXT}
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=balanced -j$JOBS clean || die "Failed to clean bSNES balanced core"
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=balanced -j$JOBS || die "Failed to build bSNES balanced core"
cp -f out/retro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_balanced.${FORMAT_EXT}
cp -f out/bsnes_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_balanced.${FORMAT_EXT}
else
echo "bSNES compat not fetched, skipping ..."
fi
@ -436,9 +433,8 @@ build_libretro_bsnes()
cd libretro-bsnes/higan
rm -f obj/*.o
rm -f out/*.${FORMAT_EXT}
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=accuracy -j$JOBS clean || die "Failed to clean bSNES accuracy core"
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=accuracy -j$JOBS || die "Failed to build bSNES accuracy core"
cp -f out/retro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_accuracy.${FORMAT_EXT}
cp -f out/bsnes_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_accuracy.${FORMAT_EXT}
fi
}

View File

@ -3,28 +3,29 @@
. ./libretro-config.sh
UNAME=$(uname)
if [ "`echo $UNAME | grep Linux`" ]; then
if [ $(echo $UNAME | grep Linux) ] || [ x"$platform" = x"unix" ]; then
FORMAT_EXT="so"
FORMAT_COMPILER_TARGET=unix
FORMAT_COMPILER_TARGET_ALT=unix
DIST_DIR=unix
elif [ "`echo $UNAME | grep BSD`" ]; then
elif [ $(echo $UNAME | grep BSD) ]; then
FORMAT_EXT="so"
FORMAT_COMPILER_TARGET=unix
FORMAT_COMPILER_TARGET_ALT=unix
DIST_DIR=bsd
elif [ "`echo $UNAME | grep Darwin`" ]; then
elif [ $(echo $UNAME | grep Darwin) ] || [ x"$platform" = x"osx" ]; then
FORMAT_EXT="dylib"
FORMAT_COMPILER_TARGET=osx
FORMAT_COMPILER_TARGET_ALT=osx
DIST_DIR=osx
elif [ "`echo $UNAME | grep -i MINGW`" ]; then
elif [ $(echo $UNAME | grep -i MINGW) ] || [ x"$platform" = x"win" ]; then
FORMAT_EXT="dll"
FORMAT_COMPILER_TARGET=win
FORMAT_COMPILER_TARGET_ALT=win
DIST_DIR=win
else
# assume this is UNIX-based at least
# assume this is UNIX-based at least
FORMAT_EXT="so"
FORMAT_COMPILER_TARGET=unix
FORMAT_COMPILER_TARGET_ALT=unix
@ -137,7 +138,7 @@ mkdir -p "$RARCH_DIST_DIR"
if [ $1 ]; then
$1
else
#build_libretro_bsnes
build_libretro_bsnes
build_libretro_mednafen
build_libretro_mednafen_gba
build_libretro_mednafen_snes
@ -161,7 +162,7 @@ else
build_libretro_mame078
build_libretro_dosbox
build_libretro_scummvm
if [ -z $BUILD_LIBRETRO_GL ]; then
if [ $BUILD_LIBRETRO_GL ]; then
build_libretro_modelviewer
build_libretro_scenewalker
fi