Commit 12e4c3bb authored by Felix Paul Kühne's avatar Felix Paul Kühne

build script: finish transition to fully support macOS compilation

parent 8f063e5b
...@@ -7,6 +7,7 @@ set -e ...@@ -7,6 +7,7 @@ set -e
BUILD_DEVICE=yes BUILD_DEVICE=yes
BUILD_SIMULATOR=yes BUILD_SIMULATOR=yes
BUILD_STATIC_FRAMEWORK=no BUILD_STATIC_FRAMEWORK=no
BUILD_DYNAMIC_FRAMEWORK=no
SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version` SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
SDK_MIN=7.0 SDK_MIN=7.0
VERBOSE=no VERBOSE=no
...@@ -115,6 +116,7 @@ do ...@@ -115,6 +116,7 @@ do
OSVERSIONMINLDFLAG=macosx_version_min OSVERSIONMINLDFLAG=macosx_version_min
BUILD_DEVICE=yes BUILD_DEVICE=yes
FARCH=x86_64 FARCH=x86_64
BUILD_DYNAMIC_FRAMEWORK=yes
BUILD_STATIC_FRAMEWORK=no BUILD_STATIC_FRAMEWORK=no
;; ;;
?) ?)
...@@ -185,19 +187,20 @@ buildxcodeproj() ...@@ -185,19 +187,20 @@ buildxcodeproj()
local architectures="" local architectures=""
if [ "$FARCH" = "all" ];then if [ "$FARCH" = "all" ];then
if [ "$TVOS" != "yes" ]; then if [ "$TVOS" = "yes" ]; then
if [ "$PLATFORM" = "iphonesimulator" ]; then
architectures="i386 x86_64"
else
architectures="armv7 armv7s arm64"
fi
else
if [ "$PLATFORM" = "appletvsimulator" ]; then if [ "$PLATFORM" = "appletvsimulator" ]; then
architectures="x86_64" architectures="x86_64"
else else
architectures="arm64" architectures="arm64"
fi fi
fi fi
if [ "$IOS" = "yes" ]; then
if [ "$PLATFORM" = "iphonesimulator" ]; then
architectures="i386 x86_64"
else
architectures="armv7 armv7s arm64"
fi
fi
else else
architectures=`get_actual_arch $FARCH` architectures=`get_actual_arch $FARCH`
fi fi
...@@ -1139,3 +1142,17 @@ if [ "$IOS" = "yes" ]; then ...@@ -1139,3 +1142,17 @@ if [ "$IOS" = "yes" ]; then
info "Build of static MobileVLCKit.framework completed" info "Build of static MobileVLCKit.framework completed"
fi fi
fi fi
if [ "$BUILD_DYNAMIC_FRAMEWORK" != "no" ]; then
if [ "$MACOS" = "yes" ]; then
info "Building VLCKit.framework"
buildxcodeproj VLCKit "VLCKit" "macosx"
# remove intermediate build result we don't need to keep
spushd build
rm ${CONFIGURATION}/libStaticLibVLC.a
spopd # build
info "Build of VLCKit.framework completed"
fi
fi
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