Merge pull request #7792 from heitbaum/addon-fixes

libretro-beetle-psx: for opengl builds set library name to mednafen_psx_hw_libretro
This commit is contained in:
CvH 2023-04-25 20:23:02 +02:00 committed by GitHub
commit 04f3154930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,12 +13,18 @@ PKG_TOOLCHAIN="make"
if [ "${OPENGL_SUPPORT}" = "yes" ]; then if [ "${OPENGL_SUPPORT}" = "yes" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL}" PKG_DEPENDS_TARGET+=" ${OPENGL}"
PKG_LIBNAME="mednafen_psx_hw_libretro.so"
else
PKG_LIBNAME="mednafen_psx_libretro.so"
fi fi
if [ "${VULKAN_SUPPORT}" = "yes" ]; then if [ "${VULKAN_SUPPORT}" = "yes" ]; then
PKG_DEPENDS_TARGET+=" ${VULKAN}" PKG_DEPENDS_TARGET+=" ${VULKAN}"
fi fi
PKG_LIBPATH="${PKG_LIBNAME}"
PKG_LIBVAR="BEETLE-PSX_LIB"
PKG_MAKE_OPTS_TARGET="HAVE_CDROM=1 LINK_STATIC_LIBCPLUSPLUS=0" PKG_MAKE_OPTS_TARGET="HAVE_CDROM=1 LINK_STATIC_LIBCPLUSPLUS=0"
if [ "${OPENGL_SUPPORT}" = "yes" -a "${VULKAN_SUPPORT}" = "yes" ]; then if [ "${OPENGL_SUPPORT}" = "yes" -a "${VULKAN_SUPPORT}" = "yes" ]; then
@ -29,10 +35,6 @@ elif [ "${VULKAN_SUPPORT}" = "yes" ]; then
PKG_MAKE_OPTS_TARGET+=" HAVE_VULKAN=1" PKG_MAKE_OPTS_TARGET+=" HAVE_VULKAN=1"
fi fi
PKG_LIBNAME="mednafen_psx_libretro.so"
PKG_LIBPATH="${PKG_LIBNAME}"
PKG_LIBVAR="BEETLE-PSX_LIB"
makeinstall_target() { makeinstall_target() {
mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}