Skip to content

V
vlc-2-2
Commit b2b25aeb authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

extras/ios: fix build script 

(cherry picked from commit d32f040df7c85f9331cf5f5aa6438a84e2ad8360)
parent e7d8819b
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
extras/package/ios/build.sh
View file @ b2b25aeb
......@@ -5,7 +5,7 @@ PLATFORM=OS
VERBOSE=no
SDK_VERSION=7.0
SDK_MIN=5.1
64BIT_SDK_MIN=7.0
SIXTYFOURBIT_SDK_MIN=7.0
ARCH=armv7
usage()
......@@ -132,17 +132,19 @@ export PLATFORM=$PLATFORM
export SDK_VERSION=$SDK_VERSION
export CFLAGS="-isysroot ${SDKROOT} -arch ${ARCH} ${OPTIM}"
if [ "$PLATFORM" = "OS" ]; then
if [ "$ARCH" != "arm64" ]; then
export CFLAGS="${CFLAGS} -mcpu=cortex-a8 -miphoneos-version-min=${SDK_MIN}"
else
export CFLAGS="${CFLAGS} -miphoneos-version-min=${64BIT_SDK_MIN}"
export CFLAGS="${CFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
fi
else
if [ "$ARCH" != "x86_64" ]; then
export CFLAGS="${CFLAGS} -miphoneos-version-min=${SDK_MIN}"
else
export CFLAGS="${CFLAGS} -miphoneos-version-min=${64BIT_SDK_MIN}"
export CFLAGS="${CFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
fi
fi
export CXXFLAGS="${CFLAGS} -stdlib=libstdc++"
......@@ -169,9 +171,9 @@ if [ "$ARCH" != "arm64" ]; then
EXTRA_LDFLAGS+=" -miphoneos-version-min=${SDK_MIN}"
export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${SDK_MIN}"
else
EXTRA_CFLAGS+=" -miphoneos-version-min=${64BIT_SDK_MIN}"
EXTRA_LDFLAGS+=" -miphoneos-version-min=${64BIT_SDK_MIN}"
export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${64BIT_SDK_MIN}"
EXTRA_CFLAGS+=" -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
EXTRA_LDFLAGS+=" -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
fi
EXTRA_LDFLAGS="-arch ${ARCH}"
else
......@@ -182,9 +184,9 @@ if [ "$ARCH" != "x86_64" ]; then
EXTRA_LDFLAGS+=" -miphoneos-version-min=${SDK_MIN}"
export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${SDK_MIN}"
else
EXTRA_CFLAGS+=" -miphoneos-version-min=${64BIT_SDK_MIN}"
EXTRA_LDFLAGS+=" -miphoneos-version-min=${64BIT_SDK_MIN}"
export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${64BIT_SDK_MIN}"
EXTRA_CFLAGS+=" -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
EXTRA_LDFLAGS+=" -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
export LDFLAGS="${LDFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}"
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