vlc | branch: master | Felix Paul Kühne <[email protected]> | Thu Aug 2 18:25:29 2012 +0200| [488bd51835b88d4eccbc5bdf7716528ccb1ec7cd] | committer: Felix Paul Kühne
extras/package: iOS: enable thumb for compilation, clean up the AS definitions and disable freetype for now > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=488bd51835b88d4eccbc5bdf7716528ccb1ec7cd --- extras/package/ios/build.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh index 0409e88..f8f7dbf 100755 --- a/extras/package/ios/build.sh +++ b/extras/package/ios/build.sh @@ -77,7 +77,6 @@ if [ "$PLATFORM" = "Simulator" ]; then else TARGET="arm-apple-darwin11" ARCH="armv7" - OPTIM="-mno-thumb" fi info "Using ${ARCH} with SDK version ${SDK_VERSION}" @@ -165,15 +164,9 @@ mkdir -p "${VLCROOT}/contrib/iPhone${PLATFORM}" cd "${VLCROOT}/contrib/iPhone${PLATFORM}" if [ "$PLATFORM" = "OS" ]; then - if [ "$SDK_VERSION" = "6.0" ]; then - export AS="${IOS_GAS_PREPROCESSOR} clang" - export ASCPP="${IOS_GAS_PREPROCESSOR} clang" - 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 + export AS="${IOS_GAS_PREPROCESSOR} ${CC}" + export ASCPP="${IOS_GAS_PREPROCESSOR} ${CC}" + export CCAS="${IOS_GAS_PREPROCESSOR} ${CC}" else export AS="xcrun as" export ASCPP="xcrun as" @@ -312,6 +305,7 @@ ${VLCROOT}/configure \ --disable-speex \ --disable-theora \ --disable-flac \ + --disable-freetype \ --disable-mmx > ${out} # MMX and SSE support requires llvm which is broken on Simulator fi _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
