mirror of
https://github.com/ZDoom/fluidsynth.git
synced 2025-02-21 11:21:24 +00:00
update build script, still broken.
This commit is contained in:
parent
fc4dcd709e
commit
6e23e82a29
3 changed files with 13 additions and 13 deletions
|
@ -7,13 +7,13 @@ mkdir -p $DEV
|
|||
# build
|
||||
|
||||
ANDROID_ABI_CMAKE=armeabi-v7a ./extract.sh || exit 1
|
||||
ARCH='arm' ANDROID_ARCH='armv7a' ANDROID_ABI_CMAKE='armeabi-v7a' ANDROID_TARGET_ABI='eabi' AUTOTOOLS_TARGET="$ARCH-none-linux-$ANDROID_TARGET_ABI" ./build.sh || exit 1
|
||||
ARCH='arm' ANDROID_ARCH='armv7a' ANDROID_ABI_CMAKE='armeabi-v7a' ANDROID_TARGET_ABI='eabi' AUTOTOOLS_TARGET="$ARCH-none-linux-android$ANDROID_TARGET_ABI" ./build.sh || exit 1
|
||||
|
||||
ANDROID_ABI_CMAKE=arm64-v8a ./extract.sh || exit 1
|
||||
ARCH='aarch64' ANDROID_ARCH='aarch64' ANDROID_ABI_CMAKE='arm64-v8a' ANDROID_TARGET_ABI='' AUTOTOOLS_TARGET="$ARCH-none-linux" ./build.sh || exit 1
|
||||
ARCH='aarch64' ANDROID_ARCH='aarch64' ANDROID_ABI_CMAKE='arm64-v8a' ANDROID_TARGET_ABI='' AUTOTOOLS_TARGET="$ARCH-none-linux-android" ./build.sh || exit 1
|
||||
|
||||
ANDROID_ABI_CMAKE=x86 ./extract.sh || exit 1
|
||||
ARCH='i686' ANDROID_ARCH='i686' ANDROID_ABI_CMAKE='x86' ANDROID_TARGET_ABI='' AUTOTOOLS_TARGET="$ARCH-pc-linux" ./build.sh || exit 1
|
||||
ARCH='i686' ANDROID_ARCH='i686' ANDROID_ABI_CMAKE='x86' ANDROID_TARGET_ABI='' AUTOTOOLS_TARGET="$ARCH-pc-linux-android" ./build.sh || exit 1
|
||||
|
||||
ANDROID_ABI_CMAKE=x86_64 ./extract.sh || exit 1
|
||||
ARCH='x86_64' ANDROID_ARCH='x86_64' ANDROID_ABI_CMAKE='x86_64' ANDROID_TARGET_ABI='' AUTOTOOLS_TARGET="$ARCH-pc-linux" ./build.sh || exit 1
|
||||
ARCH='x86_64' ANDROID_ARCH='x86_64' ANDROID_ABI_CMAKE='x86_64' ANDROID_TARGET_ABI='' AUTOTOOLS_TARGET="$ARCH-pc-linux-android" ./build.sh || exit 1
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
source ./build-env.sh
|
||||
|
||||
if [ -z $parameters_installCommand ] ; then
|
||||
if [ -z "$parameters_installCommand" ] ; then
|
||||
parameters_installCommand="make install"
|
||||
fi
|
||||
|
||||
if [ -z $parameters_workDir ] ; then
|
||||
if [ -z "$parameters_workDir" ] ; then
|
||||
parameters_workDir=$DEV
|
||||
fi
|
||||
|
||||
|
@ -34,17 +34,17 @@ source ./build-env.sh
|
|||
-DANDROID_TOOLCHAIN=$CC \
|
||||
-DANDROID_NDK=$NDK \
|
||||
-DANDROID_COMPILER_FLAGS="${CFLAGS}" \
|
||||
-DANDROID_LINKER_FLAGS=${LDFLAGS} \
|
||||
-DANDROID_LINKER_FLAGS="${LDFLAGS}" \
|
||||
-DANDROID_STL="c++_shared" \
|
||||
-DCMAKE_REQUIRED_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_REQUIRED_LINK_OPTIONS=${LDFLAGS} \
|
||||
-DCMAKE_REQUIRED_LINK_OPTIONS="${LDFLAGS}" \
|
||||
-DCMAKE_INSTALL_PREFIX=$PREFIX \
|
||||
-DCMAKE_STAGING_PREFIX=$PREFIX \
|
||||
-DBUILD_SHARED_LIBS=1 \
|
||||
-DLIB_SUFFIX="" \
|
||||
$parameters_cmakeArgs ..
|
||||
#-DCMAKE_VERBOSE_MAKEFILE=1 \
|
||||
make -j$((`nproc`+1))
|
||||
make -j$((`nproc`+1)) || (popd && popd && exit 1)
|
||||
$parameters_installCommand
|
||||
popd
|
||||
popd
|
||||
|
|
|
@ -96,8 +96,8 @@
|
|||
--disable-silent-rules \
|
||||
--disable-gtk-doc \
|
||||
--disable-introspection
|
||||
make -j$((`nproc`+1)) || exit 1
|
||||
make install || exit 1
|
||||
make -j$((`nproc`+1)) || echo "Failed to build gettext(-tools), but it is expected. We continue build..."
|
||||
make install || echo "Failed to build gettext(-tools), but it is expected. We continue build..."
|
||||
popd
|
||||
|
||||
# glib
|
||||
|
@ -238,13 +238,13 @@ EOF
|
|||
# To avoid the entire build failures, we ignore the
|
||||
# exit coode here and go on with fake executable file.
|
||||
# It is not runnable on Android anyways.
|
||||
parameters_cmakeArgs="-Denable-opensles=1 -Denable-floats=1 -Denable-oboe=1 -Denable-dbus=0 -Denable-oss=0" parameters_sourceDir=../../.. parameters_workDir= parameters_condition= parameters_installCommand='echo success' bash ./build-call-cmake.sh || echo "Failed to build fluidsynth, but it is expected. We continue build..." && touch ../../../build_$ANDROID_ABI_CMAKE/src/fluidsynth
|
||||
parameters_cmakeArgs="-Denable-opensles=1 -Denable-floats=1 -Denable-oboe=1 -Denable-dbus=0 -Denable-oss=0" parameters_sourceDir=../.. parameters_workDir= parameters_condition= parameters_installCommand='echo success' bash ./build-call-cmake.sh || echo "Failed to build fluidsynth, but it is expected. We continue build..." && touch ../../build_$ANDROID_ABI_CMAKE/src/fluidsynth
|
||||
|
||||
# TBD: test (there should be a complete Android project that installs apk, launches on android device, loads native tests there through JNI as a library, and run them, automatically.)
|
||||
|
||||
# install
|
||||
set -ex
|
||||
pushd ../../../build_$ANDROID_ABI_CMAKE
|
||||
pushd ../../build_$ANDROID_ABI_CMAKE
|
||||
make install
|
||||
popd
|
||||
|
||||
|
|
Loading…
Reference in a new issue