mirror/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super synced 2025-04-18 11:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Massively clean up mupen64plus rule

Browse Source
This commit is contained in:
T. Joseph Carter 2015-02-22 23:00:15 -08:00
parent ac43c12ab4
commit 88f9dfeb1b
3 changed files with 30 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libretro-build-common.sh
View File

@ -1,6 +1,7 @@
# vim: set ts=3 sw=3 noet ft=sh : bash # vim: set ts=3 sw=3 noet ft=sh : bash
. "${BASE_DIR}/script-modules/fetch-rules.sh" . "${BASE_DIR}/script-modules/fetch-rules.sh"
. "${BASE_DIR}/script-modules/cpu.sh"
die() { die() {
echo $1 echo $1
@ -660,51 +661,26 @@ build_libretro_mupen64() {
echo_cmd "cd \"$build_dir\"" echo_cmd "cd \"$build_dir\""
mkdir -p obj mkdir -p obj
if [ "$X86" ] && [ "$X86_64" ]; then
echo '=== Building Mupen 64 Plus (x86_64 dynarec) ===' if iscpu_x86_64 $ARCH; then
if [ -z "$NOCLEAN" ]; then dynarec="WITH_DYNAREC=x86_64"
echo_cmd "$MAKE WITH_DYNAREC='x86_64' platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\" clean" || die 'Failed to clean Mupen 64 (x86_64 dynarec)' elif iscpu_x86 $ARCH; then
dynarec="WITH_DYNAREC=x86"
elif [ "${CORTEX_A8}" ] || [ "${CORTEX_A9}" ] || [ "$platform" = "ios" ]; then
dynarec="WITH_DYNAREC=arm"
fi fi
if [ "$CC $CXX" != " " ]; then
echo_cmd "$MAKE WITH_DYNAREC='x86_64' platform=\"$FORMAT_COMPILER_TARGET_ALT\" CC=\"$CC\" CXX=\"$CXX\" \"-j$JOBS\"" || die 'Failed to build Mupen 64 (x86_64 dynarec)'
else
# TODO: Remove this condition post-1.1
echo_cmd "$MAKE WITH_DYNAREC='x86_64' platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\"" || die 'Failed to build Mupen 64 (x86_64 dynarec)'
fi
elif [ "$X86" ]; then
echo '=== Building Mupen 64 Plus (x86 32bit dynarec) ==='
if [ -z "$NOCLEAN" ]; then
echo_cmd "$MAKE WITH_DYNAREC='x86' platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\" clean" || die 'Failed to clean Mupen 64 (x86 dynarec)'
fi
if [ "$CC $CXX" != " " ]; then
echo_cmd "$MAKE WITH_DYNAREC='x86' platform=\"$FORMAT_COMPILER_TARGET_ALT\" CC=\"$CC\" CXX=\"$CXX\" \"-j$JOBS\"" || die 'Failed to build Mupen 64 (x86 dynarec)'
else
# TODO: Remove this condition post-1.1
echo_cmd "$MAKE WITH_DYNAREC='x86' platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\"" || die 'Failed to build Mupen 64 (x86 dynarec)'
fi
elif [ "${CORTEX_A8}" ] || [ "${CORTEX_A9}" ] || [ "${IOS}" ]; then
echo '=== Building Mupen 64 Plus (ARM dynarec) ==='
if [ -z "$NOCLEAN" ]; then
echo_cmd "$MAKE WITH_DYNAREC='arm' platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\"" || die 'Failed to clean Mupen 64 (ARM dynarec)'
fi
if [ "$CC $CXX" != " " ]; then
echo_cmd "$MAKE WITH_DYNAREC='arm' platform=\"$FORMAT_COMPILER_TARGET_ALT\" CC=\"$CC\" CXX=\"$CXX\" \"-j$JOBS\"" || die 'Failed to build Mupen 64 (ARM dynarec)'
else
# TODO: Remove this condition post-1.1
echo_cmd "$MAKE WITH_DYNAREC='arm' platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\"" || die 'Failed to build Mupen 64 (ARM dynarec)'
fi
else
echo '=== Building Mupen 64 Plus ===' echo '=== Building Mupen 64 Plus ==='
if [ -z "$NOCLEAN" ]; then if [ -z "$NOCLEAN" ]; then
echo_cmd "$MAKE \"-j$JOBS\" clean" || die 'Failed to clean Mupen 64' echo_cmd "$MAKE $dynarec platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\" clean" || die 'Failed to clean Mupen 64'
fi fi
if [ "$CC $CXX" != " " ]; then if [ "$CC $CXX" != " " ]; then
echo_cmd "$MAKE platform=\"$FORMAT_COMPILER_TARGET_ALT\" CC=\"$CC\" CXX=\"$CXX\" \"-j$JOBS\"" || die 'Failed to build Mupen 64' echo_cmd "$MAKE $dynarec platform=\"$FORMAT_COMPILER_TARGET_ALT\" CC=\"$CC\" CXX=\"$CXX\" \"-j$JOBS\"" || die 'Failed to build Mupen 64'
else else
# TODO: Remove this condition post-1.1 echo_cmd "$MAKE $dynarec platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\"" || die 'Failed to build Mupen 64'
echo_cmd "$MAKE platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\"" || die 'Failed to build Mupen 64'
fi
fi fi
echo_cmd "cp \"mupen64plus$CORE_SUFFIX\" \"$RARCH_DIST_DIR\"" echo_cmd "cp \"mupen64plus$CORE_SUFFIX\" \"$RARCH_DIST_DIR\""
ret=$? ret=$?
build_summary_log $ret "mupen64plus" build_summary_log $ret "mupen64plus"

1
libretro-config.sh
View File

@ -24,6 +24,7 @@ case "$platform" in
DIST_DIR="ios" DIST_DIR="ios"
FORMAT_EXT=dylib FORMAT_EXT=dylib
IOS=1 IOS=1
ARCH=armv7
FORMAT=_ios FORMAT=_ios
FORMAT_COMPILER_TARGET=ios FORMAT_COMPILER_TARGET=ios
FORMAT_COMPILER_TARGET_ALT=ios FORMAT_COMPILER_TARGET_ALT=ios

17
script-modules/cpu.sh
View File

@ -13,32 +13,33 @@ host_cpu() {
cpu_isx86() { iscpu_x86() {
case ${1:-`uname -m`} in case ${1:-`uname -m`} in
i386|i586|i686|x86_64) echo "true" ;; i386|i486|i586|i686|x86_64) return 0 ;;
*) [ "${PROCESSOR_ARCHITEW6432}" = "AMD64" ] && echo "true" ;; *) [ "${PROCESSOR_ARCHITEW6432}" = "AMD64" ] && return 0 ;;
esac esac
return 1
} }
cpu_isx86_64() { iscpu_x86_64() {
[ ${1:-`uname -m`} = "x86_64" ] && return 0 [ ${1:-`uname -m`} = "x86_64" ] && return 0
return 1 return 1
} }
cpu_isarm() { iscpu_arm() {
case ${1:-`uname -m`} in case ${1:-`uname -m`} in
armv*) return 0 ;; armv*) return 0 ;;
esac esac
return 1 return 1
} }
cpu_isarmv5() { iscpu_armv5() {
[ "${1:-`uname -m`}" = "armv5tel" ] && return 0 [ "${1:-`uname -m`}" = "armv5tel" ] && return 0
return 1 return 1
} }
# Consider using armv6* here? # Consider using armv6* here?
cpu_isarmv6() { iscpu_armv6() {
case ${1:-`uname -m`} in case ${1:-`uname -m`} in
armv6l|armv6) return 0 ;; armv6l|armv6) return 0 ;;
esac esac
@ -47,7 +48,7 @@ cpu_isarmv6() {
# Consider using armv7* here? # Consider using armv7* here?
# armv7s is Apple A6 chip # armv7s is Apple A6 chip
cpu_isarmv7() { iscpu_armv7() {
case ${1:-`uname -m`} in case ${1:-`uname -m`} in
armv7l|armv7|armv7s) return 0 ;; armv7l|armv7|armv7s) return 0 ;;
esac esac