fix ios build scripts after sharpyuv dep added

in:
d55d447c Make libwebp depend on libsharpyuv.

Change-Id: I8efa679686b792da4cedf23f580152fecfe42275
This commit is contained in:
James Zern 2022-03-08 19:50:36 -08:00
parent d0d2292e1a
commit c3d0c2d7d8
2 changed files with 10 additions and 14 deletions

View File

@ -133,10 +133,9 @@ for PLATFORM in ${PLATFORMS}; do
CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS}"
set +x set +x
# run make only in the src/ directory to create libwebp.a/libwebpdecoder.a # Build only the libraries, skip the examples.
cd src/ make V=0 -C sharpyuv
make V=0 make V=0 -C src install
make install
LIBLIST+=" ${ROOTDIR}/lib/libwebp.a" LIBLIST+=" ${ROOTDIR}/lib/libwebp.a"
DECLIBLIST+=" ${ROOTDIR}/lib/libwebpdecoder.a" DECLIBLIST+=" ${ROOTDIR}/lib/libwebpdecoder.a"
@ -144,7 +143,6 @@ for PLATFORM in ${PLATFORMS}; do
DEMUXLIBLIST+=" ${ROOTDIR}/lib/libwebpdemux.a" DEMUXLIBLIST+=" ${ROOTDIR}/lib/libwebpdemux.a"
make clean make clean
cd ..
export PATH=${OLDPATH} export PATH=${OLDPATH}
done done

View File

@ -186,10 +186,9 @@ for (( i = 0; i < $NUM_PLATFORMS; ++i )); do
CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS}"
set +x set +x
# run make only in the src/ directory to create libwebp.a/libwebpdecoder.a # Build only the libraries, skip the examples.
cd src/ make V=0 -C sharpyuv
make V=0 make V=0 -C src install
make install
LIBLIST+=("${ROOTDIR}/lib/libwebp.a") LIBLIST+=("${ROOTDIR}/lib/libwebp.a")
DECLIBLIST+=("${ROOTDIR}/lib/libwebpdecoder.a") DECLIBLIST+=("${ROOTDIR}/lib/libwebpdecoder.a")
@ -197,17 +196,16 @@ for (( i = 0; i < $NUM_PLATFORMS; ++i )); do
DEMUXLIBLIST+=("${ROOTDIR}/lib/libwebpdemux.a") DEMUXLIBLIST+=("${ROOTDIR}/lib/libwebpdemux.a")
# xcodebuild requires a directory for the -headers option, these will match # xcodebuild requires a directory for the -headers option, these will match
# for all builds. # for all builds.
make install-data DESTDIR="${ROOTDIR}/lib-headers" make -C src install-data DESTDIR="${ROOTDIR}/lib-headers"
make install-commonHEADERS DESTDIR="${ROOTDIR}/dec-headers" make -C src install-commonHEADERS DESTDIR="${ROOTDIR}/dec-headers"
make -C demux install-data DESTDIR="${ROOTDIR}/demux-headers" make -C src/demux install-data DESTDIR="${ROOTDIR}/demux-headers"
make -C mux install-data DESTDIR="${ROOTDIR}/mux-headers" make -C src/mux install-data DESTDIR="${ROOTDIR}/mux-headers"
LIB_HEADERS="${ROOTDIR}/lib-headers/${ROOTDIR}/include/webp" LIB_HEADERS="${ROOTDIR}/lib-headers/${ROOTDIR}/include/webp"
DEC_HEADERS="${ROOTDIR}/dec-headers/${ROOTDIR}/include/webp" DEC_HEADERS="${ROOTDIR}/dec-headers/${ROOTDIR}/include/webp"
DEMUX_HEADERS="${ROOTDIR}/demux-headers/${ROOTDIR}/include/webp" DEMUX_HEADERS="${ROOTDIR}/demux-headers/${ROOTDIR}/include/webp"
MUX_HEADERS="${ROOTDIR}/mux-headers/${ROOTDIR}/include/webp" MUX_HEADERS="${ROOTDIR}/mux-headers/${ROOTDIR}/include/webp"
make distclean make distclean
cd ..
export PATH=${OLDPATH} export PATH=${OLDPATH}
done done