From 9acf18ba46f00cc191977157021c1886c035d211 Mon Sep 17 00:00:00 2001 From: Aidan O'Loan Date: Fri, 7 Jun 2019 17:39:52 -0700 Subject: [PATCH] iosbuild.sh: add WebP{Demux,Mux}.framework Change-Id: I2c16475a7bf9f63d07f4298df7c68859226669d5 --- iosbuild.sh | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/iosbuild.sh b/iosbuild.sh index 971efc8a..e4031de0 100755 --- a/iosbuild.sh +++ b/iosbuild.sh @@ -35,11 +35,15 @@ readonly TOPDIR=$(pwd) readonly BUILDDIR="${TOPDIR}/iosbuild" readonly TARGETDIR="${TOPDIR}/WebP.framework" readonly DECTARGETDIR="${TOPDIR}/WebPDecoder.framework" +readonly MUXTARGETDIR="${TOPDIR}/WebPMux.framework" +readonly DEMUXTARGETDIR="${TOPDIR}/WebPDemux.framework" readonly DEVELOPER=$(xcode-select --print-path) readonly PLATFORMSROOT="${DEVELOPER}/Platforms" readonly LIPO=$(xcrun -sdk iphoneos${SDK} -find lipo) LIBLIST='' DECLIBLIST='' +MUXLIBLIST='' +DEMUXLIBLIST='' if [[ -z "${SDK}" ]]; then echo "iOS SDK not available" @@ -53,8 +57,10 @@ else echo "iOS SDK Version ${SDK}" fi -rm -rf ${BUILDDIR} ${TARGETDIR} ${DECTARGETDIR} -mkdir -p ${BUILDDIR} ${TARGETDIR}/Headers/ ${DECTARGETDIR}/Headers/ +rm -rf ${BUILDDIR} ${TARGETDIR} ${DECTARGETDIR} \ + ${MUXTARGETDIR} ${DEMUXTARGETDIR} +mkdir -p ${BUILDDIR} ${TARGETDIR}/Headers/ ${DECTARGETDIR}/Headers/ \ + ${MUXTARGETDIR}/Headers/ ${DEMUXTARGETDIR}/Headers/ if [[ ! -e ${SRCDIR}/configure ]]; then if ! (cd ${SRCDIR} && sh autogen.sh); then @@ -105,6 +111,7 @@ for PLATFORM in ${PLATFORMS}; do --build=$(${SRCDIR}/config.guess) \ --disable-shared --enable-static \ --enable-libwebpdecoder --enable-swap-16bit-csp \ + --enable-libwebpmux \ CFLAGS="${CFLAGS}" set +x @@ -115,6 +122,8 @@ for PLATFORM in ${PLATFORMS}; do LIBLIST+=" ${ROOTDIR}/lib/libwebp.a" DECLIBLIST+=" ${ROOTDIR}/lib/libwebpdecoder.a" + MUXLIBLIST+=" ${ROOTDIR}/lib/libwebpmux.a" + DEMUXLIBLIST+=" ${ROOTDIR}/lib/libwebpdemux.a" make clean cd .. @@ -122,8 +131,20 @@ for PLATFORM in ${PLATFORMS}; do export PATH=${OLDPATH} done +echo "LIBLIST = ${LIBLIST}" cp -a ${SRCDIR}/src/webp/{decode,encode,types}.h ${TARGETDIR}/Headers/ ${LIPO} -create ${LIBLIST} -output ${TARGETDIR}/WebP +echo "DECLIBLIST = ${DECLIBLIST}" cp -a ${SRCDIR}/src/webp/{decode,types}.h ${DECTARGETDIR}/Headers/ ${LIPO} -create ${DECLIBLIST} -output ${DECTARGETDIR}/WebPDecoder + +echo "MUXLIBLIST = ${MUXLIBLIST}" +cp -a ${SRCDIR}/src/webp/{types,mux,mux_types}.h \ + ${MUXTARGETDIR}/Headers/ +${LIPO} -create ${MUXLIBLIST} -output ${MUXTARGETDIR}/WebPMux + +echo "DEMUXLIBLIST = ${DEMUXLIBLIST}" +cp -a ${SRCDIR}/src/webp/{decode,types,mux_types,demux}.h \ + ${DEMUXTARGETDIR}/Headers/ +${LIPO} -create ${DEMUXLIBLIST} -output ${DEMUXTARGETDIR}/WebPDemux