From 492ab8c7f66ae57d9db31ab8acb2446ebdbcb642 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Sat, 20 Apr 2019 16:27:15 +0900 Subject: [PATCH] [Android] add libsndfile to build. (#532) This brings in support for compressed soundfonts (sf3) for Android. We need libsndfile.so, but it has various dependencies (libogg, libvorbis, libflac), which are somewhat annoying to build if you do everything by yourself. Fortunately cerbero has recipes for libogg, libvorbis and libflac. I added custom recipe for libsndfile in the referenced cerbero fork, and therefore the changes could be just in cerbero world. --- doc/android/Makefile.android | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/android/Makefile.android b/doc/android/Makefile.android index b57b7306..951ac423 100644 --- a/doc/android/Makefile.android +++ b/doc/android/Makefile.android @@ -3,10 +3,11 @@ # # What `build` target does: # -# - build cerbero to build glib +# - build cerbero to build glib, libogg, libvorbis, libflac, and libsndfile. # - build glib-2.0.so and many other dependency shared libraries # - build Oboe shared library # - build libfluidsynth.so +# - build libfluidsynth-assetloader.so # # Android app developers are supposed to copy all those shared # libraries into their apks (per ABI). @@ -41,7 +42,7 @@ $(OBOE): .PHONY: checkout-cerbero checkout-cerbero: $(CERBERO) - cd $(CERBERO) && git checkout 7a6fd79 + cd $(CERBERO) && git checkout 0acd9b0 $(CERBERO): git clone https://github.com/atsushieno/cerbero.git $(CERBERO) @@ -52,7 +53,7 @@ build: build-oboe dist-oboe build-deps-cerbero dist-deps-cerbero build-fluidsynt .PHONY: build-deps-cerbero build-deps-cerbero: for abi in $(ABIS_SIMPLE) ; do \ - cd $(CERBERO) && ./cerbero-uninstalled -c config/cross-android-$$abi.cbc build glib && cd $(PWD) ; \ + cd $(CERBERO) && ./cerbero-uninstalled -c config/cross-android-$$abi.cbc build glib libsndfile && cd $(PWD) ; \ done define run_make_abi_target