k
/
ffmpeg-android-maker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switching to build machine's ninja binary

Browse Source
pull/14/head
Javernaut 5 years ago
parent 8f4c36606c
commit c6d72e109f
1 changed files with 3 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      scripts/export-host-variables.sh

6
scripts/export-host-variables.sh
Unescape View File

@ -25,10 +25,10 @@ export HOST_NPROC=$HOST_NPROC
# Using CMake from the Android SDK # Using CMake from the Android SDK
export CMAKE_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.10.2.4988404/bin/cmake export CMAKE_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.10.2.4988404/bin/cmake
# Using Ninja from the Android SDK # Using Build machine's Make, because Android NDK's Make (before r21) doesn't work properly in MSYS2 on Windows
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=$(which make) export MAKE_EXECUTABLE=$(which make)
# Using Build machine's Ninja. It is used for libdav1d building. Needs to be installed
export NINJA_EXECUTABLE=$(which ninja)
# Meson is used for libdav1d building. Needs to be installed # Meson is used for libdav1d building. Needs to be installed
export MESON_EXECUTABLE=$(which meson) export MESON_EXECUTABLE=$(which meson)
# Nasm is used for libdav1d building. Needs to be installed # Nasm is used for libdav1d building. Needs to be installed

Write Preview
Loading…
Cancel
Save