Skip to content

Commit 4fba6c6

Browse files
committed
Fix building on Linux and ARM builds
1 parent adf2cbd commit 4fba6c6

2 files changed

Lines changed: 14 additions & 2 deletions

File tree

scripts.d/50-evc/50-xevd.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,21 @@ ffbuild_dockerdl() {
1717
ffbuild_dockerbuild() {
1818
mkdir ffbuild && cd ffbuild
1919

20+
local myconf=()
21+
if [[ $TARGET == *arm* ]]; then
22+
myconf+=(-DARM=TRUE)
23+
fi
24+
2025
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" \
2126
-DCMAKE_BUILD_TYPE=Release \
2227
-DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
28+
"${myconf[@]}" \
2329
..
2430
make -j$(nproc)
2531
make install DESTDIR="$FFBUILD_DESTDIR"
2632

2733
mv "$FFBUILD_DESTPREFIX"/lib/{xevd/libxevd.a,}
28-
rm -rf "$FFBUILD_DESTPREFIX"/lib/{libxevd.dll*,xevd,xevd_base}
34+
rm -rf "$FFBUILD_DESTPREFIX"/lib/{libxevd.dll*,libxevd.so*,xevd,xevd_base}
2935

3036
echo "Cflags.private: -DXEVD_STATIC_DEFINE" >> "$FFBUILD_DESTPREFIX"/lib/pkgconfig/xevd.pc
3137
}

scripts.d/50-evc/55-xeve.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,21 @@ ffbuild_dockerdl() {
1717
ffbuild_dockerbuild() {
1818
mkdir ffbuild && cd ffbuild
1919

20+
local myconf=()
21+
if [[ $TARGET == *arm* ]]; then
22+
myconf+=(-DARM=TRUE)
23+
fi
24+
2025
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" \
2126
-DCMAKE_BUILD_TYPE=Release \
2227
-DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
28+
"${myconf[@]}" \
2329
..
2430
make -j$(nproc)
2531
make install DESTDIR="$FFBUILD_DESTDIR"
2632

2733
mv "$FFBUILD_DESTPREFIX"/lib/{xeve/libxeve.a,}
28-
rm -rf "$FFBUILD_DESTPREFIX"/lib/{libxeve.dll*,xeve,xeve_base}
34+
rm -rf "$FFBUILD_DESTPREFIX"/lib/{libxeve.dll*,libxeve.so*,xeve,xeve_base}
2935

3036
echo "Cflags.private: -DXEVE_STATIC_DEFINE" >> "$FFBUILD_DESTPREFIX"/lib/pkgconfig/xeve.pc
3137
}

0 commit comments

Comments
 (0)