Commit 488bd518 authored by Felix Paul Kühne's avatar Felix Paul Kühne

extras/package: iOS: enable thumb for compilation, clean up the AS definitions...

extras/package: iOS: enable thumb for compilation, clean up the AS definitions and disable freetype for now
parent 099a7dd8
...@@ -77,7 +77,6 @@ if [ "$PLATFORM" = "Simulator" ]; then ...@@ -77,7 +77,6 @@ if [ "$PLATFORM" = "Simulator" ]; then
else else
TARGET="arm-apple-darwin11" TARGET="arm-apple-darwin11"
ARCH="armv7" ARCH="armv7"
OPTIM="-mno-thumb"
fi fi
info "Using ${ARCH} with SDK version ${SDK_VERSION}" info "Using ${ARCH} with SDK version ${SDK_VERSION}"
...@@ -165,15 +164,9 @@ mkdir -p "${VLCROOT}/contrib/iPhone${PLATFORM}" ...@@ -165,15 +164,9 @@ mkdir -p "${VLCROOT}/contrib/iPhone${PLATFORM}"
cd "${VLCROOT}/contrib/iPhone${PLATFORM}" cd "${VLCROOT}/contrib/iPhone${PLATFORM}"
if [ "$PLATFORM" = "OS" ]; then if [ "$PLATFORM" = "OS" ]; then
if [ "$SDK_VERSION" = "6.0" ]; then export AS="${IOS_GAS_PREPROCESSOR} ${CC}"
export AS="${IOS_GAS_PREPROCESSOR} clang" export ASCPP="${IOS_GAS_PREPROCESSOR} ${CC}"
export ASCPP="${IOS_GAS_PREPROCESSOR} clang" export CCAS="${IOS_GAS_PREPROCESSOR} ${CC}"
export CCAS="${IOS_GAS_PREPROCESSOR} clang"
else
export AS="${IOS_GAS_PREPROCESSOR} xcrun clang"
export ASCPP="${IOS_GAS_PREPROCESSOR} xcrun clang"
export CCAS="${IOS_GAS_PREPROCESSOR} xcrun clang"
fi
else else
export AS="xcrun as" export AS="xcrun as"
export ASCPP="xcrun as" export ASCPP="xcrun as"
...@@ -312,6 +305,7 @@ ${VLCROOT}/configure \ ...@@ -312,6 +305,7 @@ ${VLCROOT}/configure \
--disable-speex \ --disable-speex \
--disable-theora \ --disable-theora \
--disable-flac \ --disable-flac \
--disable-freetype \
--disable-mmx > ${out} # MMX and SSE support requires llvm which is broken on Simulator --disable-mmx > ${out} # MMX and SSE support requires llvm which is broken on Simulator
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