From b615639ab14dd0757e215c143027e065edffb8f6 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 2 Sep 2019 10:17:25 +0200 Subject: [PATCH] libretro-desmume: fix build ported from https://github.com/5schatten/LibreELEC-RR/tree/master-rr/packages/5schatten/emulation/libretro/desmume Signed-off-by: Matthias Reichl --- .../emulation/libretro-desmume/package.mk | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/emulation/libretro-desmume/package.mk b/packages/emulation/libretro-desmume/package.mk index aef2bd8f58f..98234706077 100644 --- a/packages/emulation/libretro-desmume/package.mk +++ b/packages/emulation/libretro-desmume/package.mk @@ -7,26 +7,20 @@ PKG_SHA256="13713a32e2e797308f6a677a0a8e65c628339519bd9a8a10b8a495c5120aa1d6" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/desmume" PKG_URL="https://github.com/libretro/desmume/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain kodi-platform" +PKG_DEPENDS_TARGET="toolchain kodi-platform libpcap" PKG_LONGDESC="libretro wrapper for desmume NDS emulator." PKG_TOOLCHAIN="make" PKG_LIBNAME="desmume_libretro.so" -PKG_LIBPATH="desmume/$PKG_LIBNAME" +PKG_LIBPATH="desmume/src/frontend/libretro/${PKG_LIBNAME}" PKG_LIBVAR="DESMUME_LIB" -make_target() { - case $TARGET_CPU in - arm1176jzf-s) - make -C desmume -f Makefile.libretro platform=armv6-hardfloat-$TARGET_CPU - ;; - cortex-a7|cortex-a9) - make -C desmume -f Makefile.libretro platform=armv7-neon-hardfloat-$TARGET_CPU - ;; - x86-64) - make -C desmume -f Makefile.libretro - ;; - esac +PKG_MAKE_OPTS_TARGET="-C desmume/src/frontend/libretro GIT_VERSION=${PKG_VERSION:0:7}" + +pre_configure_target() { + if [ "${ARCH}" = "arm" ]; then + PKG_MAKE_OPTS_TARGET+=" platform=armv-${TARGET_FLOAT}float-${TARGET_CPU}" + fi } makeinstall_target() {