Commit f04ca116 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Continue the same and simplify

parent 8f2c4370
...@@ -266,8 +266,8 @@ cd contrib/contrib-android-${TARGET_TUPLE} ...@@ -266,8 +266,8 @@ cd contrib/contrib-android-${TARGET_TUPLE}
echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak
echo "EXTRA_LDFLAGS= ${EXTRA_LDFLAGS}" >> config.mak echo "EXTRA_LDFLAGS= ${EXTRA_LDFLAGS}" >> config.mak
export VLC_EXTRA_CFLAGS="${EXTRA_CFLAGS}" export VLC_EXTRA_CFLAGS="${EXTRA_CFLAGS}" # Makefile
export VLC_EXTRA_LDFLAGS="${EXTRA_LDFLAGS}" export VLC_EXTRA_LDFLAGS="${EXTRA_LDFLAGS}" # Makefile
make fetch make fetch
# We already have zlib available # We already have zlib available
......
...@@ -148,17 +148,6 @@ then ...@@ -148,17 +148,6 @@ then
exit 0 exit 0
fi fi
# Make in //
if [ -z "$MAKEFLAGS" ]; then
UNAMES=$(uname -s)
MAKEFLAGS=
if which nproc >/dev/null; then
MAKEFLAGS=-j`nproc`
elif [ "$UNAMES" == "Darwin" ] && which sysctl >/dev/null; then
MAKEFLAGS=-j`sysctl -n machdep.cpu.thread_count`
fi
fi
############ ############
# Make VLC # # Make VLC #
############ ############
...@@ -179,10 +168,9 @@ else ...@@ -179,10 +168,9 @@ else
TARGET= TARGET=
fi fi
export ANDROID_SYS_HEADERS=${PWD}/android-headers export ANDROID_SYS_HEADERS=${PWD}/android-headers # Android.mk
export ANDROID_LIBS=${PWD}/android-libs # Android.mk
export ANDROID_LIBS=${PWD}/android-libs export VLC_BUILD_DIR=vlc/build-android-${TARGET_TUPLE} # Android.mk
export VLC_BUILD_DIR=vlc/build-android-${TARGET_TUPLE}
make $CLEAN make $CLEAN
make -j1 TARGET_TUPLE=$TARGET_TUPLE SYSROOT=$SYSROOT GCCVER=$GCCVER RELEASE=$RELEASE $TARGET make -j1 TARGET_TUPLE=$TARGET_TUPLE SYSROOT=$SYSROOT GCCVER=$GCCVER RELEASE=$RELEASE $TARGET
...@@ -213,11 +201,12 @@ echo "# Re-run 'sh compile.sh' to update this file." >> env.sh ...@@ -213,11 +201,12 @@ echo "# Re-run 'sh compile.sh' to update this file." >> env.sh
# The essentials # The essentials
cat <<EssentialsA >> env.sh cat <<EssentialsA >> env.sh
export ANDROID_API=$ANDROID_API
export ANDROID_ABI=$ANDROID_ABI
export ANDROID_SDK=$ANDROID_SDK export ANDROID_SDK=$ANDROID_SDK
export ANDROID_NDK=$ANDROID_NDK export ANDROID_NDK=$ANDROID_NDK
export ANDROID_ABI=$ANDROID_ABI
export ANDROID_API=$ANDROID_API
export GCCVER=$GCCVER export GCCVER=$GCCVER
export SYSROOT=$SYSROOT
export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS export ANDROID_SYS_HEADERS=$ANDROID_SYS_HEADERS
export ANDROID_LIBS=$ANDROID_LIBS export ANDROID_LIBS=$ANDROID_LIBS
export VLC_BUILD_DIR=$VLC_BUILD_DIR export VLC_BUILD_DIR=$VLC_BUILD_DIR
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment