Commit a366094c authored by Felix Paul Kühne's avatar Felix Paul Kühne

contrib: enable support for custom SDKROOTs without messing with the system...

contrib: enable support for custom SDKROOTs without messing with the system and add support for tvOS
parent 593262d8
...@@ -158,6 +158,10 @@ add_make_enabled() ...@@ -158,6 +158,10 @@ add_make_enabled()
check_ios_sdk() check_ios_sdk()
{ {
if test "$VLCSDKROOT"
then
SDKROOT="$VLCSDKROOT"
else
if test -z "$SDKROOT" if test -z "$SDKROOT"
then then
SDKROOT=`xcode-select -print-path`/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk SDKROOT=`xcode-select -print-path`/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk
...@@ -165,6 +169,7 @@ check_ios_sdk() ...@@ -165,6 +169,7 @@ check_ios_sdk()
else else
SDKROOT="$SDKROOT" SDKROOT="$SDKROOT"
fi fi
fi
if [ ! -d "${SDKROOT}" ] if [ ! -d "${SDKROOT}" ]
then then
...@@ -263,6 +268,10 @@ case "${OS}" in ...@@ -263,6 +268,10 @@ case "${OS}" in
;; ;;
esac; esac;
fi fi
if test "$BUILDFORTVOS"
then
add_make_enabled "HAVE_TVOS"
fi
;; ;;
*bsd*) *bsd*)
add_make_enabled "HAVE_BSD" add_make_enabled "HAVE_BSD"
......
...@@ -91,7 +91,11 @@ VPX_CONF += --sdk-path=$(MACOSX_SDK) ...@@ -91,7 +91,11 @@ VPX_CONF += --sdk-path=$(MACOSX_SDK)
endif endif
ifdef HAVE_IOS ifdef HAVE_IOS
VPX_CONF += --sdk-path=$(IOS_SDK) --enable-vp8-decoder --disable-vp8-encoder --disable-vp9-encoder VPX_CONF += --sdk-path=$(IOS_SDK) --enable-vp8-decoder --disable-vp8-encoder --disable-vp9-encoder
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=6.1 VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) -miphoneos-version-min=6.1
endif
ifeq ($(ARCH),aarch64) ifeq ($(ARCH),aarch64)
VPX_LDFLAGS += -arch arm64 VPX_LDFLAGS += -arch arm64
else else
......
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