videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-10-15 08:37:59 +02:00
Code Releases Activity

contrib: move some android complexity outside of vlc.git

Browse Source
This commit is contained in:
Rafaël Carré 2012-08-03 15:25:39 +02:00
parent c97faddc52
commit 17fbcd4ed8
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/bootstrap
View File

@ -221,15 +221,12 @@ case "${OS}" in
add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
case "${HOST}" in
*arm*)
add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
add_make "PLATFORM_SHORT_ARCH := arm"
;;
*i686*)
add_make "PATH = ${ANDROID_NDK}/toolchains/x86-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
add_make "PLATFORM_SHORT_ARCH := x86"
;;
*mipsel*)
add_make "PATH = ${ANDROID_NDK}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
add_make "PLATFORM_SHORT_ARCH := mips"
;;
esac

2
contrib/src/main.mak
View File

@ -102,8 +102,6 @@ endif
ifdef HAVE_ANDROID
CC := $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)
CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)
EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include
EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ANDROID_ABI)/include
endif
ifdef HAVE_MACOSX