Commit 9c5808f8 authored by Felix Paul Kühne's avatar Felix Paul Kühne

build script: drop the remaining duplicated parameters

(cherry picked from commit 07ed2b9f)
parent 4dac5a32
...@@ -282,12 +282,8 @@ if [ "$SKIPLIBVLCCOMPILATION" != "yes" ]; then ...@@ -282,12 +282,8 @@ if [ "$SKIPLIBVLCCOMPILATION" != "yes" ]; then
fi fi
buildLibVLC() { buildLibVLC() {
VERBOSE="$1" ARCH="$1"
DEBUG="$2" PLATFORM="$2"
SCARY="$3"
BITCODE="$4"
ARCH="$5"
PLATFORM="$6"
OSSTYLE=iPhone OSSTYLE=iPhone
if [ "$DEBUG" = "yes" ]; then if [ "$DEBUG" = "yes" ]; then
...@@ -762,22 +758,22 @@ buildMobileKit() { ...@@ -762,22 +758,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" "Simulator" buildLibVLC "x86_64" "Simulator"
else else
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "aarch64" "OS" buildLibVLC "aarch64" "OS"
fi fi
fi fi
if [ "$MACOS" = "yes" ]; then if [ "$MACOS" = "yes" ]; then
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "x86_64" "OS" buildLibVLC "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" "Simulator" buildLibVLC "i386" "Simulator"
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "x86_64" "Simulator" buildLibVLC "x86_64" "Simulator"
else else
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "armv7" "OS" buildLibVLC "armv7" "OS"
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "armv7s" "OS" buildLibVLC "armv7s" "OS"
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE "aarch64" "OS" buildLibVLC "aarch64" "OS"
fi fi
fi fi
else else
...@@ -798,7 +794,7 @@ buildMobileKit() { ...@@ -798,7 +794,7 @@ buildMobileKit() {
fi fi
fi fi
if [ ! -z "$buildPlatform" ];then if [ ! -z "$buildPlatform" ];then
buildLibVLC $VERBOSE $DEBUG $SCARY $BITCODE $FARCH $buildPlatform buildLibVLC $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