ShuriZma
/
libretro-super
mirror of https://github.com/libretro/libretro-super.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ffmpeg build

This commit is contained in:
twinaphex 2013-07-14 00:34:23 +02:00
parent fc7babccab
commit d73a2b4a83
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretro-build-common.sh
View File

@ -14,11 +14,9 @@ fi
echo "Compiler: $COMPILER" echo "Compiler: $COMPILER"
export FORMAT_COMPILER_TARGET=armv
if [ "$ARM_NEON" ]; then if [ "$ARM_NEON" ]; then
echo "=== ARM NEON opts enabled... ===" echo "=== ARM NEON opts enabled... ==="
export FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET-neon export FORMAT_COMPILER_TARGET=armv-neon
echo $FORMAT_COMPILER_TARGET echo $FORMAT_COMPILER_TARGET
fi fi
if [ "$CORTEX_A8" ]; then if [ "$CORTEX_A8" ]; then
@ -47,10 +45,10 @@ check_opengl()
if [ "$BUILD_LIBRETRO_GL" ]; then if [ "$BUILD_LIBRETRO_GL" ]; then
if [ "$ENABLE_GLES"]; then if [ "$ENABLE_GLES"]; then
echo "=== OpenGL ES enabled ===" echo "=== OpenGL ES enabled ==="
export FORMAT_COMPILER_TARGET=FORMAT_COMPILER_TARGET-gles export FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET-gles
else else
echo "=== OpenGL enabled ===" echo "=== OpenGL enabled ==="
export FORMAT_COMPILER_TARGET=FORMAT_COMPILER_TARGET-opengl export FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET-opengl
fi fi
else else
echo "=== OpenGL disabled in build ===" echo "=== OpenGL disabled in build ==="
@ -64,7 +62,9 @@ build_libretro_ffmpeg()
echo "=== Checking OpenGL dependencies ===" echo "=== Checking OpenGL dependencies ==="
check_opengl check_opengl
echo "=== Building FFmpeg ===" echo "=== Building FFmpeg ==="
${MAKE} -f Makefile platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS clean || die "Failed to clean FFmpeg" cd libretro-ffmpeg
${MAKE} platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean FFmpeg"
${MAKE} platform=$FORMAT_COMPILER_TARGET -j$JOBS
cp ffmpeg_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR" cp ffmpeg_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
else else
echo "FFmpeg not fetched, skipping ..." echo "FFmpeg not fetched, skipping ..."

3
libretro-build.sh
View File

@ -106,14 +106,17 @@ elif [ $ARCH = armv5tel ]; then
echo "ARMv5 CPU detected" echo "ARMv5 CPU detected"
ARM=true ARM=true
ARMV5=true ARMV5=true
export FORMAT_COMPILER_TARGET=armv
elif [ $ARCH = armv6l ]; then elif [ $ARCH = armv6l ]; then
echo "ARMv6 CPU detected" echo "ARMv6 CPU detected"
ARM=true ARM=true
ARMV6=true ARMV6=true
export FORMAT_COMPILER_TARGET=armv
elif [ $ARCH = armv7l ]; then elif [ $ARCH = armv7l ]; then
echo "ARMv7 CPU detected" echo "ARMv7 CPU detected"
ARM=true ARM=true
ARMV7=true ARMV7=true
export FORMAT_COMPILER_TARGET=armv
fi fi
if [ "$HOST_CC" ]; then if [ "$HOST_CC" ]; then