fix building for Android

This commit is contained in:
badaix 2017-10-03 16:14:47 +02:00
parent 85fd89a9a9
commit 9c97d0576e
2 changed files with 14 additions and 4 deletions

View file

@ -1,7 +1,7 @@
#/bin/sh
export NDK_DIR_ARM="/home/johannes/Develop/android-toolchain-arm"
export NDK_DIR_MIPS="/home/johannes/Develop/android-toolchain-mips"
export NDK_DIR_X86="/home/johannes/Develop/android-toolchain-x86"
export NDK_DIR_ARM="$1-arm"
export NDK_DIR_MIPS="$1-mips"
export NDK_DIR_X86="$1-x86"
./build_android.sh

12
externals/Makefile vendored
View file

@ -41,6 +41,7 @@ else ifeq ($(ARCH), mips)
$(eval CPPFLAGS:=-DLITTLE_ENDIAN=1234 -DBIG_ENDIAN=4321 -DBYTE_ORDER=BIG_ENDIAN)
$(eval PROGRAM_PREFIX:=$(NDK_DIR)/bin/mipsel-linux-android-)
else
$(eval CPPFLAGS:=-U_ARM_ASSEM_)
$(eval PROGRAM_PREFIX:=$(NDK_DIR)/bin/arm-linux-androideabi-)
endif
$(eval CC:=$(PROGRAM_PREFIX)clang)
@ -49,6 +50,9 @@ endif
flac: check-env
@cd flac; \
export CC="$(CC)"; \
export CXX="$(CXX)"; \
export CPPFLAGS="$(CPPFLAGS)"; \
./autogen.sh; \
./configure --host=$(ARCH) --disable-ogg --prefix=$(NDK_DIR); \
make; \
@ -57,6 +61,9 @@ flac: check-env
ogg: check-env
@cd ogg; \
export CC="$(CC)"; \
export CXX="$(CXX)"; \
export CPPFLAGS="$(CPPFLAGS)"; \
./autogen.sh; \
./configure --host=$(ARCH) --prefix=$(NDK_DIR); \
make; \
@ -64,7 +71,10 @@ ogg: check-env
make clean;
tremor: check-env
cd tremor; \
@cd tremor; \
export CC="$(CC)"; \
export CXX="$(CXX)"; \
export CPPFLAGS="$(CPPFLAGS)"; \
./autogen.sh; \
./configure --host=$(ARCH) --prefix=$(NDK_DIR) --with-ogg=$(NDK_DIR); \
make; \