vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Sep 11 12:38:40 2015 +0200| [a366094cef04f70f8186338fa19f7167017beb43] | committer: Felix Paul Kühne
contrib: enable support for custom SDKROOTs without messing with the system and add support for tvOS > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a366094cef04f70f8186338fa19f7167017beb43 --- contrib/bootstrap | 35 ++++++++++++++++++++++------------- contrib/src/vpx/rules.mak | 4 ++++ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/contrib/bootstrap b/contrib/bootstrap index 6331190..4f6d4ee 100755 --- a/contrib/bootstrap +++ b/contrib/bootstrap @@ -158,20 +158,25 @@ add_make_enabled() check_ios_sdk() { - if test -z "$SDKROOT" - then - SDKROOT=`xcode-select -print-path`/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk - echo "SDKROOT not specified, assuming $SDKROOT" - else - SDKROOT="$SDKROOT" - fi + if test "$VLCSDKROOT" + then + SDKROOT="$VLCSDKROOT" + else + if test -z "$SDKROOT" + then + SDKROOT=`xcode-select -print-path`/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk + echo "SDKROOT not specified, assuming $SDKROOT" + else + SDKROOT="$SDKROOT" + fi + fi - if [ ! -d "${SDKROOT}" ] - then - echo "*** ${SDKROOT} does not exist, please install required SDK, or set SDKROOT manually. ***" - exit 1 - fi - add_make "IOS_SDK=${SDKROOT}" + if [ ! -d "${SDKROOT}" ] + then + echo "*** ${SDKROOT} does not exist, please install required SDK, or set SDKROOT manually. ***" + exit 1 + fi + add_make "IOS_SDK=${SDKROOT}" } check_macosx_sdk() @@ -263,6 +268,10 @@ case "${OS}" in ;; esac; fi + if test "$BUILDFORTVOS" + then + add_make_enabled "HAVE_TVOS" + fi ;; *bsd*) add_make_enabled "HAVE_BSD" diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index dd9295e..4b94389 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -91,7 +91,11 @@ VPX_CONF += --sdk-path=$(MACOSX_SDK) endif ifdef HAVE_IOS 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 +endif ifeq ($(ARCH),aarch64) VPX_LDFLAGS += -arch arm64 else _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
