diff --git a/packages/emulation/libretro-beetle-pcfx/package.mk b/packages/emulation/libretro-beetle-pcfx/package.mk index ec77e4a64c..25070bf673 100644 --- a/packages/emulation/libretro-beetle-pcfx/package.mk +++ b/packages/emulation/libretro-beetle-pcfx/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libretro-beetle-pcfx" -PKG_VERSION="89d16cd" +PKG_VERSION="f53c58a" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-pcfx-libretro" @@ -29,10 +29,11 @@ PKG_SHORTDESC="Standalone port of Mednafen PCFX to libretro" PKG_LONGDESC="Standalone port of Mednafen PCFX to libretro" PKG_AUTORECONF="no" PKG_IS_ADDON="no" +PKG_USE_CMAKE="no" PKG_LIBNAME="mednafen_pcfx_libretro.so" PKG_LIBPATH="$PKG_LIBNAME" -PKG_LIBVAR="BEETLE_PCFX_LIB" +PKG_LIBVAR="BEETLE-PCFX_LIB" make_target() { case $PROJECT in @@ -58,8 +59,8 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib - cp $PKG_LIBPATH $INSTALL/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $INSTALL/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/$PKG_NAME-config.cmake + mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME + cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME + echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake } diff --git a/packages/emulation/libretro-beetle-pcfx/patches/libretro-beetle-pcfx-0001-fix-cross-compile.patch b/packages/emulation/libretro-beetle-pcfx/patches/libretro-beetle-pcfx-0001-fix-cross-compile.patch index 378561e011..e7fc1b3f39 100644 --- a/packages/emulation/libretro-beetle-pcfx/patches/libretro-beetle-pcfx-0001-fix-cross-compile.patch +++ b/packages/emulation/libretro-beetle-pcfx/patches/libretro-beetle-pcfx-0001-fix-cross-compile.patch @@ -1,8 +1,15 @@ -diff -Naur a/Makefile b/Makefile ---- a/Makefile 2016-01-28 10:20:33.000000000 -0800 -+++ b/Makefile 2016-05-11 01:37:49.370618722 -0700 -@@ -193,7 +193,7 @@ - TARGET := $(TARGET_NAME).so +commit 76f4bf49e19a856f62d0ba2bd1061ab63b45f0e4 +Author: Lukas Rusak +Date: Sun Feb 5 17:46:16 2017 -0800 + + don't hard code cc and cxx + +diff --git a/Makefile b/Makefile +index 142113a..86a9fac 100644 +--- a/Makefile ++++ b/Makefile +@@ -197,7 +197,7 @@ else ifneq (,$(findstring armv,$(platform))) + TARGET := $(TARGET_NAME)_libretro.so fpic := -fPIC SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T - CC = gcc @@ -10,10 +17,10 @@ diff -Naur a/Makefile b/Makefile LDFLAGS += $(PTHREAD_FLAGS) FLAGS += $(PTHREAD_FLAGS) -DHAVE_MKDIR IS_X86 = 0 -@@ -218,8 +218,8 @@ - FLAGS += -DARM +@@ -228,8 +228,8 @@ else ifeq ($(platform), emscripten) + else - TARGET := $(TARGET_NAME).dll + TARGET := $(TARGET_NAME)_libretro.dll - CC = gcc - CXX = g++ + CC ?= gcc