Commit eb3cc0da authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

build script: remove legacy simulator flag

parent 83b58805
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
set -e set -e
PLATFORM=iphoneos
SDK=`xcrun --sdk iphoneos --show-sdk-version` SDK=`xcrun --sdk iphoneos --show-sdk-version`
SDK_MIN=7.0 SDK_MIN=7.0
VERBOSE=no VERBOSE=no
...@@ -19,12 +18,11 @@ TESTEDMEDIALIBRARYKITHASH=e5ca039f ...@@ -19,12 +18,11 @@ TESTEDMEDIALIBRARYKITHASH=e5ca039f
usage() usage()
{ {
cat << EOF cat << EOF
usage: $0 [-s] [-v] [-k sdk] [-d] [-n] [-l] [-u] usage: $0 [-v] [-k sdk] [-d] [-n] [-l] [-t]
OPTIONS OPTIONS
-k Specify which sdk to use (see 'xcodebuild -showsdks', current: ${SDK}) -k Specify which sdk to use (see 'xcodebuild -showsdks', current: ${SDK})
-v Be more verbose -v Be more verbose
-s Build for simulator
-d Enable Debug -d Enable Debug
-n Skip script steps requiring network interaction -n Skip script steps requiring network interaction
-l Skip libvlc compilation -l Skip libvlc compilation
...@@ -59,15 +57,11 @@ buildxcworkspace() ...@@ -59,15 +57,11 @@ buildxcworkspace()
info "Building the workspace $1 ($target, ${CONFIGURATION})" info "Building the workspace $1 ($target, ${CONFIGURATION})"
local architectures="" local architectures=""
if [ "$PLATFORM" = "iphonesimulator" ]; then architectures="armv7 armv7s arm64"
architectures="i386 x86_64"
else
architectures="armv7 armv7s arm64"
fi
xcodebuild -workspace "$1.xcworkspace" \ xcodebuild -workspace "$1.xcworkspace" \
-scheme "Pods-vlc-ios" \ -scheme "Pods-vlc-ios" \
-sdk $PLATFORM$SDK \ -sdk iphoneos$SDK \
-configuration ${CONFIGURATION} \ -configuration ${CONFIGURATION} \
ARCHS="${architectures}" \ ARCHS="${architectures}" \
IPHONEOS_DEPLOYMENT_TARGET=${SDK_MIN} > ${out} IPHONEOS_DEPLOYMENT_TARGET=${SDK_MIN} > ${out}
...@@ -83,9 +77,6 @@ do ...@@ -83,9 +77,6 @@ do
v) v)
VERBOSE=yes VERBOSE=yes
;; ;;
s)
PLATFORM=iphonesimulator
;;
d) CONFIGURATION="Debug" d) CONFIGURATION="Debug"
;; ;;
n) n)
......
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