diff --git a/src/scripts/build.sh b/src/scripts/build.sh index 911243f48..275c3d39b 100755 --- a/src/scripts/build.sh +++ b/src/scripts/build.sh @@ -30,11 +30,10 @@ BUILD_ENGINE=${BUILD_ENGINE:-"OFF"} REL=${REL:-0} APPIMG=20240401 SDK=1.0.0 -SKIA=1.0.0-682c91fa URL=https://github.com/friction2d/friction-sdk/releases/download/v${SDK} APPIMAGE_TAR=friction-appimage-tools-${APPIMG}.tar.xz SDK_TAR=friction-sdk-${SDK}-linux-x86_64.tar.xz -SKIA_TAR=skia-static-${SKIA}-linux-x86_64.tar.xz +SKIA_TAR=skia-friction-09e64895-linux-x86_64.tar.xz mkdir -p distfiles/sdk || true diff --git a/src/scripts/build_vfxplatform_friction.sh b/src/scripts/build_vfxplatform_friction.sh index c3615a5c8..a18e97293 100755 --- a/src/scripts/build_vfxplatform_friction.sh +++ b/src/scripts/build_vfxplatform_friction.sh @@ -111,9 +111,9 @@ cmake --build . if [ "${BUILD_ENGINE}" = "ON" ]; then (cd src/engine ; - tar cf skia-static-${VERSION}-linux-x86_64.tar skia + tar cf skia-friction-${VERSION}-linux-x86_64.tar skia mkdir -p /mnt/builds/${VERSION} || true - mv skia-static-${VERSION}-linux-x86_64.tar /mnt/builds/${VERSION}/ + mv skia-friction-${VERSION}-linux-x86_64.tar /mnt/builds/${VERSION}/ ) fi diff --git a/src/scripts/build_vfxplatform_package.sh b/src/scripts/build_vfxplatform_package.sh index e893a7fdf..96df3192b 100755 --- a/src/scripts/build_vfxplatform_package.sh +++ b/src/scripts/build_vfxplatform_package.sh @@ -29,6 +29,7 @@ FRICTION_PKG=friction-${VERSION} APPIMAGETOOL=bfe6e0c APPIMAGERUNTIME=1bb1157 +SKIA_LIB=${DISTFILES}/skia/libskia.friction.so if [ "${VERSION}" = "" ]; then echo "Missing version" @@ -143,6 +144,12 @@ for so in *.so*; do done ) +PKG_SKIA_LIB=${BUILD}/${FRICTION_PKG}/opt/friction/lib/libskia.friction.so +if [ -f "${SKIA_LIB}" ] && [ ! -f "${PKG_SKIA_LIB}" ]; then + cp -a ${SKIA_LIB} ${BUILD}/${FRICTION_PKG}/opt/friction/lib/ + strip -s ${PKG_SKIA_LIB} +fi + PLUGS=" audio platforminputcontexts