From f3e5a7d29609c37066500194987295f2476fe7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Garc=C3=A9s?= Date: Mon, 23 Oct 2017 14:05:14 +0000 Subject: [PATCH] emulation: Replace DEVICE and PROJECT variables with TARGET_CPU --- .../emulation/libretro-beetle-pcfx/package.mk | 21 +++------ packages/emulation/libretro-craft/package.mk | 39 ++++++++--------- .../emulation/libretro-desmume/package.mk | 22 +++------- .../emulation/libretro-mame2010/package.mk | 21 +++------ .../emulation/libretro-mame2014/package.mk | 21 +++------ .../emulation/libretro-mupen64plus/package.mk | 43 ++++++++++--------- .../libretro-pcsx-rearmed/package.mk | 33 ++++++-------- packages/emulation/libretro-ppsspp/package.mk | 22 +++------- .../emulation/libretro-reicast/package.mk | 36 +++++++--------- 9 files changed, 103 insertions(+), 155 deletions(-) diff --git a/packages/emulation/libretro-beetle-pcfx/package.mk b/packages/emulation/libretro-beetle-pcfx/package.mk index 3871056aa8..5e8bb72b6e 100644 --- a/packages/emulation/libretro-beetle-pcfx/package.mk +++ b/packages/emulation/libretro-beetle-pcfx/package.mk @@ -34,28 +34,21 @@ PKG_LIBPATH="$PKG_LIBNAME" PKG_LIBVAR="BEETLE-PCFX_LIB" make_target() { - case $PROJECT in - RPi) - case $DEVICE in - RPi) - make platform=armv6-hardfloat - ;; - RPi2) - make platform=armv7-neon-hardfloat - ;; - esac + case $TARGET_CPU in + arm1176jzf-s) + make platform=armv6-hardfloat ;; - imx6) - make platform=armv7-cortexa9-neon-hardfloat + cortex-a7) + make platform=armv7-neon-hardfloat ;; - WeTek_Play|WeTek_Core|Odroid_C2|WeTek_Hub|WeTek_Play_2) + cortex-a9|cortex-a53|cortex-a17) if [ "$TARGET_ARCH" = "aarch64" ]; then make platform=aarch64 else make platform=armv7-cortexa9-neon-hardfloat fi ;; - Generic) + x86-64) make ;; esac diff --git a/packages/emulation/libretro-craft/package.mk b/packages/emulation/libretro-craft/package.mk index 78718ef425..e5a0a8d62c 100644 --- a/packages/emulation/libretro-craft/package.mk +++ b/packages/emulation/libretro-craft/package.mk @@ -40,30 +40,29 @@ pre_configure_target() { } make_target() { - case $PROJECT in - RPi) - case $DEVICE in - RPi) - make -f Makefile.libretro platform=rpi - ;; - RPi2) - make -f Makefile.libretro platform=rpi2 - ;; - esac - ;; - imx6) - make -f Makefile.libretro platform=imx6 - ;; - WeTek_Play|WeTek_Core|Odroid_C2|WeTek_Hub|WeTek_Play_2) - if [ "$TARGET_ARCH" = "aarch64" ]; then - make -f Makefile.libretro platform=aarch64 - else - make -f Makefile.libretro platform=armv7-neon-gles-cortex-a9 - fi + + if [ -z "$DEVICE" ]; then + PKG_DEVICE_NAME=$PROJECT + else + PKG_DEVICE_NAME=$DEVICE + fi + + case $PKG_DEVICE_NAME in + RPi|RPi2) + make -f Makefile.libretro platform=${PKG_DEVICE_NAME,,} ;; Generic) make -f Makefile.libretro ;; + *) + if [ "$TARGET_CPU" = "cortex-a9" ] || [ "$TARGET_CPU" = "cortex-a53" ] || [ "$TARGET_CPU" = "cortex-a17" ]; then + if [ "$TARGET_ARCH" = "aarch64" ]; then + make -f Makefile.libretro platform=aarch64 + else + make -f Makefile.libretro platform=armv7-neon-gles-cortex-a9 + fi + fi + ;; esac } diff --git a/packages/emulation/libretro-desmume/package.mk b/packages/emulation/libretro-desmume/package.mk index 025c065421..68631967ca 100644 --- a/packages/emulation/libretro-desmume/package.mk +++ b/packages/emulation/libretro-desmume/package.mk @@ -34,24 +34,14 @@ PKG_LIBPATH="$PKG_LIBNAME" PKG_LIBVAR="DESMUME_LIB" make_target() { - case $PROJECT in - RPi) - case $DEVICE in - RPi) - make -f Makefile.libretro platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a7 - ;; - esac + case $TARGET_CPU in + arm1176jzf-s) + make -f Makefile.libretro platform=armv6-hardfloat-$TARGET_CPU ;; - imx6) - make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a9 + cortex-a7|cortex-a9) + make -f Makefile.libretro platform=armv7-neon-hardfloat-$TARGET_CPU ;; - WeTek_Play|WeTek_Core) - make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a9 - ;; - Generic) + x86-64) make -f Makefile.libretro ;; esac diff --git a/packages/emulation/libretro-mame2010/package.mk b/packages/emulation/libretro-mame2010/package.mk index db033dfdc6..cf16d317bd 100644 --- a/packages/emulation/libretro-mame2010/package.mk +++ b/packages/emulation/libretro-mame2010/package.mk @@ -41,28 +41,21 @@ pre_make_target() { } make_target() { - case $PROJECT in - RPi) - case $DEVICE in - RPi) - make platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make platform=armv7-neon-hardfloat-cortex-a7 - ;; - esac + case $TARGET_CPU in + arm1176jzf-s) + make platform=armv6-hardfloat-$TARGET_CPU ;; - imx6) - make platform=armv7-neon-hardfloat-cortex-a9 + cortex-a7|cortex-a9) + make platform=armv7-neon-hardfloat-$TARGET_CPU ;; - WeTek_Play|WeTek_Core|Odroid_C2|WeTek_Hub|WeTek_Play_2) + cortex-a53|cortex-a17) if [ "$TARGET_ARCH" = "aarch64" ]; then make platform=aarch64 else make platform=armv7-neon-hardfloat-cortex-a9 fi ;; - Generic) + x86-64) make ;; esac diff --git a/packages/emulation/libretro-mame2014/package.mk b/packages/emulation/libretro-mame2014/package.mk index 236cdf89cb..e14f48f9d9 100644 --- a/packages/emulation/libretro-mame2014/package.mk +++ b/packages/emulation/libretro-mame2014/package.mk @@ -41,28 +41,21 @@ pre_make_target() { } make_target() { - case $PROJECT in - RPi) - case $DEVICE in - RPi) - make platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make platform=armv7-neon-hardfloat-cortex-a7 - ;; - esac + case $TARGET_CPU in + arm1176jzf-s) + make platform=armv6-hardfloat-$TARGET_CPU ;; - imx6) - make platform=armv7-neon-hardfloat-cortex-a9 + cortex-a7|cortex-a9) + make platform=armv7-neon-hardfloat-$TARGET_CPU ;; - WeTek_Play|WeTek_Core|Odroid_C2|WeTek_Hub|WeTek_Play_2) + cortex-a53|cortex-a17) if [ "$TARGET_ARCH" = "aarch64" ]; then make platform=aarch64 else make platform=armv7-neon-hardfloat-cortex-a9 fi ;; - Generic) + x86-64) make ;; esac diff --git a/packages/emulation/libretro-mupen64plus/package.mk b/packages/emulation/libretro-mupen64plus/package.mk index 760d714a5b..8ff945f4c1 100644 --- a/packages/emulation/libretro-mupen64plus/package.mk +++ b/packages/emulation/libretro-mupen64plus/package.mk @@ -34,30 +34,33 @@ PKG_LIBPATH="$PKG_LIBNAME" PKG_LIBVAR="MUPEN64PLUS_LIB" make_target() { - case $PROJECT in - RPi) - case $DEVICE in - RPi) - make platform=rpi - ;; - RPi2) - make platform=rpi2 - ;; - esac - ;; - imx6) - make platform=imx6 - ;; - WeTek_Play|WeTek_Core|Odroid_C2|WeTek_Hub|WeTek_Play_2) - if [ "$TARGET_ARCH" = "aarch64" ]; then - make platform=aarch64 - else - make platform=armv7-neon-gles-cortex-a9 - fi + + if target_has_feature neon; then + export HAVE_NEON=1 + fi + + if [ -z "$DEVICE" ]; then + PKG_DEVICE_NAME=$PROJECT + else + PKG_DEVICE_NAME=$DEVICE + fi + + case $PKG_DEVICE_NAME in + RPi|RPi2) + make platform=${PKG_DEVICE_NAME,,} ;; Generic) make WITH_DYNAREC=x86_64 ;; + *) + if [ "$TARGET_CPU" = "cortex-a9" ] || [ "$TARGET_CPU" = "cortex-a53" ] || [ "$TARGET_CPU" = "cortex-a17" ]; then + if [ "$TARGET_ARCH" = "aarch64" ]; then + make platform=aarch64 + else + make WITH_DYNAREC=arm + fi + fi + ;; esac } diff --git a/packages/emulation/libretro-pcsx-rearmed/package.mk b/packages/emulation/libretro-pcsx-rearmed/package.mk index b0437ddd55..ae8af2fdd1 100644 --- a/packages/emulation/libretro-pcsx-rearmed/package.mk +++ b/packages/emulation/libretro-pcsx-rearmed/package.mk @@ -40,28 +40,21 @@ pre_make_target() { make_target() { cd $PKG_BUILD - case $PROJECT in - RPi) - case $DEVICE in - RPi) - make -f Makefile.libretro platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a7 - ;; - esac + + if target_has_feature neon; then + export HAVE_NEON=1 + else + export HAVE_NEON=0 + fi + + case $TARGET_ARCH in + aarch64) + make -f Makefile.libretro platform=aarch64 ;; - imx6) - make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a9 + arm) + make -f Makefile.libretro USE_DYNAREC=1 ;; - WeTek_Play|WeTek_Core|Odroid_C2|WeTek_Hub|WeTek_Play_2) - if [ "$TARGET_ARCH" = "aarch64" ]; then - make -f Makefile.libretro platform=aarch64 - else - make -f Makefile.libretro platform=armv7-neon-hardfloat-cortex-a9 - fi - ;; - Generic) + x86-64) make -f Makefile.libretro ;; esac diff --git a/packages/emulation/libretro-ppsspp/package.mk b/packages/emulation/libretro-ppsspp/package.mk index cf7de27cb1..711002b6de 100644 --- a/packages/emulation/libretro-ppsspp/package.mk +++ b/packages/emulation/libretro-ppsspp/package.mk @@ -45,24 +45,14 @@ pre_make_target() { } make_target() { - case $PROJECT in - RPi) - case $DEVICE in - RPi) - make -C libretro platform=armv6-gles-hardfloat-arm1176jzf-s - ;; - RPi2) - make -C libretro platform=armv7-neon-gles-hardfloat-cortex-a7 - ;; - esac + case $TARGET_CPU in + arm1176jzf-s) + make -C libretro platform=armv6-gles-hardfloat-$TARGET_CPU ;; - imx6) - make -C libretro platform=armv7-neon-gles-hardfloat-cortex-a9 + cortex-a7|cortex-a9) + make -C libretro platform=armv7-neon-gles-hardfloat-$TARGET_CPU ;; - WeTek_Play|WeTek_Core) - make -C libretro platform=armv7-neon-gles-hardfloat-cortex-a9 - ;; - Generic) + x86-64) make -C libretro ;; esac diff --git a/packages/emulation/libretro-reicast/package.mk b/packages/emulation/libretro-reicast/package.mk index b53a2fa09b..e8f93e9cff 100644 --- a/packages/emulation/libretro-reicast/package.mk +++ b/packages/emulation/libretro-reicast/package.mk @@ -34,27 +34,21 @@ PKG_LIBPATH="$PKG_LIBNAME" PKG_LIBVAR="REICAST_LIB" make_target() { - case $PROJECT in - RPi) - case $DEVICE in - RPi) - make platform=armv6-hardfloat-arm1176jzf-s - ;; - RPi2) - make platform=rpi2 - ;; - esac - ;; - imx6) - make platform=armv7-neon-hardfloat-cortex-a9 - ;; - WeTek_Play|WeTek_Core) - make platform=armv7-neon-hardfloat-cortex-a9 - ;; - Generic) - make - ;; - esac + if [ "$DEVICE" = "RPi2" ]; then + make platform=${DEVICE,,} + else + case $TARGET_CPU in + arm1176jzf-s) + make platform=armv6-hardfloat-$TARGET_CPU + ;; + cortex-a7|cortex-a9) + make platform=armv7-neon-hardfloat-$TARGET_CPU + ;; + x86-64) + make + ;; + esac + fi } makeinstall_target() {