Commit f44ff83a authored by Alexandre Janniaux's avatar Alexandre Janniaux
Browse files

contrib: vpx: remove now obsolete flags

parent 48df29ca
Pipeline #17127 failed with stage
in 57 minutes and 49 seconds
......@@ -38,7 +38,7 @@ else
VPX_CROSS :=
endif
VPX_LDFLAGS := $(LDFLAGS)
VPX_LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
ifeq ($(ARCH),arm)
VPX_ARCH := armv7
......@@ -116,29 +116,17 @@ ifndef BUILD_ENCODERS
VPX_CONF += --disable-vp8-encoder --disable-vp9-encoder
endif
VPX_CONF += \
--extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)" \
--disable-tools
ifndef HAVE_WIN32
VPX_CONF += --enable-pic
else
VPX_CONF += --extra-cflags="-mstackrealign"
endif
ifdef HAVE_MACOSX
VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)"
endif
ifdef HAVE_IOS
VPX_CONF += --enable-vp8-decoder --disable-tools
VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)"
ifdef HAVE_TVOS
VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) -mtvos-version-min=9.0
else
VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) -miphoneos-version-min=8.4
endif
ifeq ($(ARCH),aarch64)
VPX_LDFLAGS += -arch arm64
else
ifndef HAVE_IOS
VPX_LDFLAGS += -arch $(ARCH)
endif
endif
VPX_CONF += --enable-vp8-decoder
endif
ifneq ($(filter i386 x86_64,$(ARCH)),)
......
Supports Markdown
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