3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-04 12:46:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add Opus to Android make targets

Browse source
This commit is contained in:
badaix 2019-12-05 22:56:20 +01:00
parent 5da2df1e48
commit 6c819b8f0c
5 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -7,3 +7,6 @@
[submodule "externals/tremor"] [submodule "externals/tremor"]
path = externals/tremor path = externals/tremor
url = https://git.xiph.org/tremor.git url = https://git.xiph.org/tremor.git
[submodule "externals/opus"]
path = externals/opus
url = https://git.xiph.org/opus.git

2
client/Makefile
View file

@ -59,7 +59,7 @@ ifeq ($(TARGET), ANDROID)
CXX = $(PROGRAM_PREFIX)clang++ CXX = $(PROGRAM_PREFIX)clang++
CXXFLAGS += -pthread -fPIC -DHAS_TREMOR -DHAS_OPENSL -I$(NDK_DIR)/include CXXFLAGS += -pthread -fPIC -DHAS_TREMOR -DHAS_OPENSL -I$(NDK_DIR)/include
LDFLAGS = -L$(NDK_DIR)/lib -pie -lvorbisidec -logg -lFLAC -lOpenSLES -latomic -llog -static-libstdc++ LDFLAGS = -L$(NDK_DIR)/lib -pie -lvorbisidec -logg -lopus -lFLAC -lOpenSLES -latomic -llog -static-libstdc++
OBJ += player/opensl_player.o OBJ += player/opensl_player.o
else ifeq ($(TARGET), OPENWRT) else ifeq ($(TARGET), OPENWRT)

4
client/build_android.sh
View file

@ -13,11 +13,11 @@ fi
if [ -n "$NDK_DIR_ARM" ]; then if [ -n "$NDK_DIR_ARM" ]; then
export NDK_DIR="$NDK_DIR_ARM" export NDK_DIR="$NDK_DIR_ARM"
export ARCH=arm export ARCH=arm
make clean; make TARGET=ANDROID -j 4; mv ./snapclient "$ASSETS_DIR/bin/armeabi/" make clean; make TARGET=ANDROID -j 4; $NDK_DIR/bin/arm-linux-android-strip ./snapclient; mv ./snapclient "$ASSETS_DIR/bin/armeabi/"
fi fi
if [ -n "$NDK_DIR_X86" ]; then if [ -n "$NDK_DIR_X86" ]; then
export NDK_DIR="$NDK_DIR_X86" export NDK_DIR="$NDK_DIR_X86"
export ARCH=x86 export ARCH=x86
make clean; make TARGET=ANDROID -j 4; mv ./snapclient "$ASSETS_DIR/bin/x86/" make clean; make TARGET=ANDROID -j 4; $NDK_DIR/bin/i686-linux-android-strip ./snapclient; mv ./snapclient "$ASSETS_DIR/bin/x86/"
fi fi

15
externals/Makefile vendored
View file

@ -14,9 +14,9 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
.PHONY: all check-env flac ogg tremor .PHONY: all check-env flac ogg opus tremor
all: flac ogg tremor all: flac ogg opus tremor
check-env: check-env:
# if [ ! -d "flac" ]; then \ # if [ ! -d "flac" ]; then \
@ -69,6 +69,17 @@ ogg: check-env
make install; \ make install; \
make clean; make clean;
opus: check-env
@cd opus; \
export CC="$(CC)"; \
export CXX="$(CXX)"; \
export CPPFLAGS="$(CPPFLAGS)"; \
./autogen.sh; \
./configure --host=$(ARCH) --prefix=$(NDK_DIR); \
make; \
make install; \
make clean;
tremor: check-env tremor: check-env
@cd tremor; \ @cd tremor; \
export CC="$(CC)"; \ export CC="$(CC)"; \

1
externals/opus vendored Submodule

@ -0,0 +1 @@
Subproject commit 93b373e884915e802188cec844a7dda2fa184ebc