Commit 4dac5a32 authored by Felix Paul Kühne's avatar Felix Paul Kühne

build script: drop duplicated parameters

(cherry picked from commit fedc1f39)
parent 7881e313
...@@ -287,10 +287,7 @@ buildLibVLC() { ...@@ -287,10 +287,7 @@ buildLibVLC() {
SCARY="$3" SCARY="$3"
BITCODE="$4" BITCODE="$4"
ARCH="$5" ARCH="$5"
TVOS="$6" PLATFORM="$6"
MACOS="$7"
SDK_VERSION="$8"
PLATFORM="$9"
OSSTYLE=iPhone OSSTYLE=iPhone
if [ "$DEBUG" = "yes" ]; then if [ "$DEBUG" = "yes" ]; then
...@@ -765,22 +762,22 @@ buildMobileKit() { ...@@ -765,22 +762,22 @@ buildMobileKit() {
if [ "$FARCH" = "all" ];then if [ "$FARCH" = "all" ];then
if [ "$TVOS" = "yes" ]; then if [ "$TVOS" = "yes" ]; then
if [ "$PLATFORM" = "iphonesimulator" ]; then if [ "$PLATFORM" = "iphonesimulator" ]; then
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "x86_64" $TVOS $MACOS $SDK_VERSION "Simulator" buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "x86_64" "Simulator"
else else
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "aarch64" $TVOS $MACOS $SDK_VERSION "OS" buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "aarch64" "OS"
fi fi
fi fi
if [ "$MACOS" = "yes" ]; then if [ "$MACOS" = "yes" ]; then
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "x86_64" $TVOS $MACOS $SDK_VERSION "OS" buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "x86_64" "OS"
fi fi
if [ "$IOS" = "yes" ]; then if [ "$IOS" = "yes" ]; then
if [ "$PLATFORM" = "iphonesimulator" ]; then if [ "$PLATFORM" = "iphonesimulator" ]; then
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "i386" $TVOS $MACOS $SDK_VERSION "Simulator" buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "i386" "Simulator"
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "x86_64" $TVOS $MACOS $SDK_VERSION "Simulator" buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "x86_64" "Simulator"
else else
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "armv7" $TVOS $MACOS $SDK_VERSION "OS" buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "armv7" "OS"
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "armv7s" $TVOS $MACOS $SDK_VERSION "OS" buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "armv7s" "OS"
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "aarch64" $TVOS $MACOS $SDK_VERSION "OS" buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "aarch64" "OS"
fi fi
fi fi
else else
...@@ -801,7 +798,7 @@ buildMobileKit() { ...@@ -801,7 +798,7 @@ buildMobileKit() {
fi fi
fi fi
if [ ! -z "$buildPlatform" ];then if [ ! -z "$buildPlatform" ];then
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE $FARCH $TVOS $MACOS $SDK_VERSION $buildPlatform buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE $FARCH $buildPlatform
fi fi
fi fi
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