Skip to content

V
vlc-2-2
Commit 54e435ee authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contrib: support Tegra2 CPUs on Android 

Cortex-a9 but no NEON? Seriously?
parent d61052a0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
contrib/bootstrap
View file @ 54e435ee
...@@ -178,6 +178,7 @@ check_android_sdk() ...@@ -178,6 +178,7 @@ check_android_sdk()
[ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1 [ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1
add_make "ANDROID_NDK := ${ANDROID_NDK}" add_make "ANDROID_NDK := ${ANDROID_NDK}"
test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON" test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
test -n "${TEGRA2}" && add_make_enabled "HAVE_TEGRA2"
} }
test -z "$PREFIX" || add_make "PREFIX := $PREFIX" test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
......
contrib/src/main.mak
View file @ 54e435ee
...@@ -105,10 +105,15 @@ CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm ...@@ -105,10 +105,15 @@ CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
ifdef HAVE_NEON ifdef HAVE_NEON
ANDROID_ABI = armeabi-v7a ANDROID_ABI = armeabi-v7a
ANDROID_CPU_FLAGS = -mfpu=neon -mcpu=cortex-a8 ANDROID_CPU_FLAGS = -mfpu=neon -mcpu=cortex-a8
else
ifdef HAVE_TEGRA2
ANDROID_ABI = armeabi-v7a
ANDROID_CPU_FLAGS = -mfpu=vfpv3-d16 -mcpu=cortex-a9
else else
ANDROID_ABI = armeabi ANDROID_ABI = armeabi
ANDROID_CPU_FLAGS = -mcpu=arm1136jf-s -mfpu=vfp ANDROID_CPU_FLAGS = -mcpu=arm1136jf-s -mfpu=vfp
endif endif
endif
EXTRA_CFLAGS += -D__STDC_VERSION__=199901L -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include EXTRA_CFLAGS += -D__STDC_VERSION__=199901L -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include
EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ANDROID_ABI)/include EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ANDROID_ABI)/include
EXTRA_CFLAGS += -mfloat-abi=softfp $(ANDROID_CPU_FLAGS) EXTRA_CFLAGS += -mfloat-abi=softfp $(ANDROID_CPU_FLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment