From dbc1ea3833480b22bf642edea6d1b4fdc68907ba Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH] moonlight-embedded: use cmake configuration --- .../addon-depends/moonlight-embedded/package.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/addons/addon-depends/moonlight-embedded/package.mk b/packages/addons/addon-depends/moonlight-embedded/package.mk index 926e74875b..dc837d5ab5 100644 --- a/packages/addons/addon-depends/moonlight-embedded/package.mk +++ b/packages/addons/addon-depends/moonlight-embedded/package.mk @@ -44,19 +44,16 @@ elif [ "$DISPLAYSERVER" = "x11" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau SDL2 ffmpeg libxcb" fi +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ + $FREESCALE_V4L_INCLUDE" + pre_build_target() { cp -a $(get_build_dir moonlight-common-c)/* $ROOT/$PKG_BUILD/third_party/moonlight-common-c } -configure_target() { - [ "$PROJECT" = "imx6" ] && strip_gold - - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - $FREESCALE_V4L_INCLUDE \ - .. +pre_configure_target() { + [ "$PROJECT" = "imx6" ] && strip_gold || true } makeinstall_target() {