Skip to content

V
vlc
Commit d61052a0 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contrib: Android simplifications

parent ce30867e
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
contrib/src/main.mak
View file @ d61052a0
...@@ -102,15 +102,16 @@ endif ...@@ -102,15 +102,16 @@ endif
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
CC := $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm CC := $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
# Kludge for C++ prebuilt compiler
EXTRA_CFLAGS += -D__STDC_VERSION__=199901L
EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include
ifdef HAVE_NEON ifdef HAVE_NEON
EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -mfloat-abi=softfp -mfpu=neon -mcpu=cortex-a8 ANDROID_ABI = armeabi-v7a
ANDROID_CPU_FLAGS = -mfpu=neon -mcpu=cortex-a8
else else
EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include -mfloat-abi=softfp -mcpu=arm1136jf-s -mfpu=vfp ANDROID_ABI = armeabi
ANDROID_CPU_FLAGS = -mcpu=arm1136jf-s -mfpu=vfp
endif endif
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 += -mfloat-abi=softfp $(ANDROID_CPU_FLAGS)
endif endif
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
......
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