Commit ed5177c8 authored by Thomas Guillem's avatar Thomas Guillem

contrib: vpx: fix armv7* build on iOS

(cherry picked from commit 7b77937d)
Signed-off-by: Thomas Guillem's avatarThomas Guillem <thomas@gllm.fr>
parent 591f6282
......@@ -33,7 +33,15 @@ endif
VPX_LDFLAGS := $(LDFLAGS)
ifeq ($(ARCH),arm)
ifdef HAVE_IOS
ifneq ($(filter armv7s%,$(subst -, ,$(HOST))),)
VPX_ARCH := armv7s
else
VPX_ARCH := armv7
endif
else
VPX_ARCH := armv7
endif
else ifeq ($(ARCH),i386)
VPX_ARCH := x86
else ifeq ($(ARCH),mips)
......@@ -59,7 +67,11 @@ else
VPX_OS := darwin10
endif
else ifdef HAVE_IOS
ifeq ($(ARCH),arm)
VPX_OS := darwin
else
VPX_OS := darwin11
endif
else ifdef HAVE_SOLARIS
VPX_OS := solaris
else ifdef HAVE_WIN64 # must be before WIN32
......@@ -78,7 +90,6 @@ endif
endif
VPX_CONF := \
--enable-runtime-cpu-detect \
--disable-docs \
--disable-examples \
--disable-unit-tests \
......@@ -87,6 +98,10 @@ VPX_CONF := \
--disable-dependency-tracking \
--enable-vp9-highbitdepth
ifndef HAVE_IOS
VPX_CONF += --enable-runtime-cpu-detect
endif
ifndef BUILD_ENCODERS
VPX_CONF += --disable-vp8-encoder --disable-vp9-encoder
endif
......@@ -109,9 +124,11 @@ endif
ifeq ($(ARCH),aarch64)
VPX_LDFLAGS += -arch arm64
else
ifndef HAVE_IOS
VPX_LDFLAGS += -arch $(ARCH)
endif
endif
endif
ifdef HAVE_ANDROID
# vpx configure.sh overrides our sysroot and it looks for it itself, and
# uses that path to look for the compiler (which we already know)
......
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