From 753b06f1334f6eb0416f207ea65eecea25d2ca91 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 23 Sep 2016 14:29:49 -0700 Subject: [PATCH] visualization.shadertoy: simplyfing cmake configuration Signed-off-by: Stephan Raue --- .../visualization.shadertoy/package.mk | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk index 312d55cc39..4057ad2576 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk @@ -43,8 +43,11 @@ if [ "$OPENGLES_SUPPORT" = yes ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES" fi -configure_target() { - if [ "$KODIPLAYER_DRIVER" = bcm2835-driver ]; then +PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ + -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr" + +pre_configure_target() { + if [ "$KODIPLAYER_DRIVER" = bcm2835-firmware ]; then BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \ -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux" export CFLAGS="$CFLAGS $BCM2835_INCLUDES" @@ -53,12 +56,6 @@ configure_target() { export CFLAGS="$CFLAGS -DLINUX -DEGL_API_FB" export CXXFLAGS="$CXXFLAGS -DLINUX -DEGL_API_FB" fi - - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \ - -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \ - .. } addon() {