wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use ninja to build parallel, use the correct branch for simplecore

Browse source
This commit is contained in:
Nicholas Ricciuti 2023-06-12 22:01:35 -04:00
parent 5e3b408736
commit ff1edb4991
No known key found for this signature in database
GPG key ID: A82FCE39A3723CDF
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-rsp-parallel/package.mk
View file

@ -27,11 +27,11 @@ make_target() {
APIDIR=${SYSROOT_PREFIX}/usr/local/include/mupen64plus
cmake -DAPIDIR=${APIDIR} ..
cmake --build . --parallel
cp ${PKG_BUILD}/build/mupen64plus-rsp-parallel.so ${PKG_BUILD}/build/mupen64plus-rsp-parallel-base.so
cp ${PKG_BUILD}/build/simple64-rsp-parallel.so ${PKG_BUILD}/build/mupen64plus-rsp-parallel-base.so
APIDIR=${SYSROOT_PREFIX}/usr/local/include/simple64
cmake -DAPIDIR=${APIDIR} ..
cmake --build . --parallel
cp ${PKG_BUILD}/build/mupen64plus-rsp-parallel.so ${PKG_BUILD}/build/mupen64plus-rsp-parallel-simple.so
cp ${PKG_BUILD}/build/simple64-rsp-parallel.so ${PKG_BUILD}/build/mupen64plus-rsp-parallel-simple.so
}
makeinstall_target() {

1
packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-simplecore/package.mk
View file

@ -10,6 +10,7 @@ PKG_DEPENDS_TARGET="toolchain boost libpng SDL2 SDL2_net zlib freetype nasm:host
PKG_SHORTDESC="simple64"
PKG_LONGDESC="Simple64's core"
PKG_TOOLCHAIN="manual"
PKG_GIT_CLONE_BRANCH="simple64"
if [ ! "${OPENGL}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"

20
packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-parallel/package.mk
View file

@ -11,11 +11,9 @@ PKG_LONGDESC="Mupen64Plus Standalone Parallel64 Video Driver"
PKG_TOOLCHAIN="manual"
PKG_GIT_CLONE_BRANCH="simple64"
if [ ! "${OPENGL}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
fi
if [ "${OPENGLES_SUPPORT}" = yes ]; then
PKG_DEPENDS_TARGET+=" ${OPENGLES}"
if [ "${VULKAN_SUPPORT}" = "yes" ]
then
PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
fi
make_target() {
@ -32,13 +30,13 @@ make_target() {
mkdir build
cd build
APIDIR=${SYSROOT_PREFIX}/usr/local/include/mupen64plus
cmake -DAPIDIR=${APIDIR} ..
cmake --build . --parallel
cp ${PKG_BUILD}/build/mupen64plus-video-parallel.so ${PKG_BUILD}/build/mupen64plus-video-parallel-base.so
cmake -G Ninja -DAPIDIR=${APIDIR} -DCMAKE_BUILD_TYPE="Release" ..
VERBOSE=1 cmake --build .
cp ${PKG_BUILD}/build/simple64-video-parallel.so ${PKG_BUILD}/build/mupen64plus-video-parallel-base.so
APIDIR=${SYSROOT_PREFIX}/usr/local/include/simple64
cmake -DAPIDIR=${APIDIR} ..
cmake --build . --parallel
cp ${PKG_BUILD}/build/mupen64plus-video-parallel.so ${PKG_BUILD}/build/mupen64plus-video-parallel-simple.so
cmake -G Ninja -DAPIDIR=${APIDIR} -DCMAKE_BUILD_TYPE="Release" ..
VERBOSE=1 cmake --build .
cp ${PKG_BUILD}/build/simple64-video-parallel.so ${PKG_BUILD}/build/mupen64plus-video-parallel-simple.so
}
makeinstall_target() {