Skip to content

Improve build #4620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quink-black wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve build #4620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccc6060
do-detect-env: set IJK_MAKE_FLAG on Linux
quink-black Feb 12, 2019
b1209b9
do-compile-ffmpeg: quoting variable
quink-black Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions android/contrib/tools/do-compile-ffmpeg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,12 @@ echo ""
echo "--------------------"
echo "[*] check ffmpeg env"
echo "--------------------"
export PATH=$FF_TOOLCHAIN_PATH/bin/:$PATH
export PATH="$FF_TOOLCHAIN_PATH/bin/:$PATH"
#export CC="ccache ${FF_CROSS_PREFIX}-gcc"
export CC="${FF_CROSS_PREFIX}-gcc"
export LD=${FF_CROSS_PREFIX}-ld
export AR=${FF_CROSS_PREFIX}-ar
export STRIP=${FF_CROSS_PREFIX}-strip
export LD="${FF_CROSS_PREFIX}-ld"
export AR="${FF_CROSS_PREFIX}-ar"
export STRIP="${FF_CROSS_PREFIX}-strip"

FF_CFLAGS="-O3 -Wall -pipe \
-std=c99 \
Expand Down
5 changes: 5 additions & 0 deletions android/contrib/tools/do-detect-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ case "$UNAME_S" in
Darwin)
export IJK_MAKE_FLAG=-j`sysctl -n machdep.cpu.thread_count`
;;
Linux)
if which nproc >/dev/null; then
export IJK_MAKE_FLAG=-j`nproc`
fi
;;
CYGWIN_NT-*)
IJK_WIN_TEMP="$(cygpath -am /tmp)"
export TEMPDIR=$IJK_WIN_TEMP/
Expand Down