From cc98ec16cf5b7c1a503072cf00661ce54eb63ba3 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 8 Dec 2019 09:07:01 +0200 Subject: [PATCH] Minor libdav1d's build script improvement --- scripts/export-host-variables.sh | 8 +++++--- scripts/libdav1d/build.sh | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/export-host-variables.sh b/scripts/export-host-variables.sh index 078d0a1..c9b4257 100755 --- a/scripts/export-host-variables.sh +++ b/scripts/export-host-variables.sh @@ -28,6 +28,8 @@ export CMAKE_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.10.2.4988404/bin/cmake # Using Ninja from the Android SDK export NINJA_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.10.2.4988404/bin/ninja # Using host Make, because Android NDK's Make (before r21) doesn't work properly in MSYS2 on Windows -export MAKE_EXECUTABLE=make -# Meson is used for libdav1d building -export MESON_EXECUTABLE=meson +export MAKE_EXECUTABLE=$(which make) +# Meson is used for libdav1d building. Needs to be installed +export MESON_EXECUTABLE=$(which meson) +# Nasm is used for libdav1d building. Needs to be installed +export NASM_EXECUTABLE=$(which nasm) diff --git a/scripts/libdav1d/build.sh b/scripts/libdav1d/build.sh index 2cacb1b..7d90f64 100755 --- a/scripts/libdav1d/build.sh +++ b/scripts/libdav1d/build.sh @@ -8,6 +8,7 @@ c = '${FAM_CC}' cpp = '${FAM_CXX}' ar = '${FAM_AR}' strip = '${FAM_STRIP}' +nasm = '${NASM_EXECUTABLE}' objcopy = '${FAM_OBJCOPY}' pkgconfig = '$(which pkg-config)' @@ -29,7 +30,7 @@ BUILD_DIRECTORY=build/${ANDROID_ABI} rm -rf ${BUILD_DIRECTORY} -meson . ${BUILD_DIRECTORY} \ +${MESON_EXECUTABLE} . ${BUILD_DIRECTORY} \ --cross-file ${CROSS_FILE_NAME} \ --default-library=static \ -Denable_asm=true \ @@ -40,5 +41,5 @@ meson . ${BUILD_DIRECTORY} \ cd ${BUILD_DIRECTORY} -${NINJA_EXECUTABLE} +${NINJA_EXECUTABLE} -j ${HOST_NPROC} ${NINJA_EXECUTABLE} install